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

Set yaml filename when loading from FileSystem.

Browse Source
This commit is contained in:
Paul Chote
2016-06-04 15:18:47 +01:00
parent 916f2ea2ea
commit b4d1517d0d
15 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/MiniYaml.cs
View File

@@ -236,9 +236,9 @@ namespace OpenRA
return FromFile(path).ToDictionary(x => x.Key, x => x.Value);
}
public static Dictionary<string, MiniYaml> DictFromStream(Stream stream)
public static Dictionary<string, MiniYaml> DictFromStream(Stream stream, string fileName = "<no filename available>")
{
return FromStream(stream).ToDictionary(x => x.Key, x => x.Value);
return FromStream(stream, fileName).ToDictionary(x => x.Key, x => x.Value);
}
public static List<MiniYamlNode> FromFile(string path)
@@ -385,7 +385,7 @@ namespace OpenRA
files = files.Append(mapFiles);
}
var yaml = files.Select(s => MiniYaml.FromStream(fileSystem.Open(s)));
var yaml = files.Select(s => MiniYaml.FromStream(fileSystem.Open(s), s));
if (mapRules != null && mapRules.Nodes.Any())
yaml = yaml.Append(mapRules.Nodes);