epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Throw an exception when map.yaml cannot be read

Browse Source
This commit is contained in:
abcdefg30
2022-10-14 13:21:26 +02:00
committed by Matthias Mailänder
parent 95c0846ced
commit fde4f8d0e5
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/Map/Map.cs
View File

@@ -294,12 +294,18 @@ namespace OpenRA
static int GetMapFormat(IReadOnlyPackage p)
{
foreach (var line in p.GetStream("map.yaml").ReadAllLines())
using (var yamlStream = p.GetStream("map.yaml"))
{
// PERF This is a way to get MapFormat without expensive yaml parsing
var search = Regex.Match(line, "^MapFormat:\\s*(\\d*)\\s*$");
if (search.Success && search.Groups.Count > 0)
return FieldLoader.GetValue<int>("MapFormat", search.Groups[1].Value);
if (yamlStream == null)
throw new FileNotFoundException("Required file map.yaml not present in this map");
foreach (var line in yamlStream.ReadAllLines())
{
// PERF This is a way to get MapFormat without expensive yaml parsing
var search = Regex.Match(line, "^MapFormat:\\s*(\\d*)\\s*$");
if (search.Success && search.Groups.Count > 0)
return FieldLoader.GetValue<int>("MapFormat", search.Groups[1].Value);
}
}
throw new InvalidDataException("MapFormat is not defined");