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

Merge pull request #6984 from DeadlySurprise/yamlFix

Browse Source 
Fixed yaml bug with leading spaces
This commit is contained in:
Oliver Brakmann
2015-01-20 21:42:22 +01:00
parent 99e2700ba7 fbe6ab7f4e
commit 7267a3afdb
5 changed files with 88 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,7 +262,7 @@ namespace OpenRA
AssertExists("map.yaml");
AssertExists("map.bin");
var yaml = new MiniYaml(null, MiniYaml.FromStream(Container.GetContent("map.yaml")));
var yaml = new MiniYaml(null, MiniYaml.FromStream(Container.GetContent("map.yaml"), path));
FieldLoader.Load(this, yaml);
// Support for formats 1-3 dropped 2011-02-11.

2
OpenRA.Game/Map/MapCache.cs
View File

@@ -60,6 +60,8 @@ namespace OpenRA
{
Console.WriteLine("Failed to load map: {0}", path);
Console.WriteLine("Details: {0}", e);
Log.Write("Debug", "Failed to load map: {0}", path);
Log.Write("Debug", "Details: {0}", e);
}
}
}