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

Fix for loading yaml from a mounted package/folder

Browse Source
This commit is contained in:
Paul Chote
2010-04-02 02:21:27 +13:00
committed by Bob
parent 1af84c9b1b
commit 586266d2dc
6 changed files with 196 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.FileFormats/Map/NewMap.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.FileFormats
public Map(string filename)
{
var yaml = MiniYaml.FromFile(filename);
var yaml = MiniYaml.FromFileInPackage(filename);
// 'Simple' metadata
foreach (var field in SimpleFields)

14
OpenRA.FileFormats/MiniYaml.cs
View File

@@ -83,8 +83,20 @@ namespace OpenRA.FileFormats
return levels[0];
}
public static Dictionary<string, MiniYaml> FromFile( string path )
public static Dictionary<string, MiniYaml> FromFileInPackage( string path )
{
StreamReader reader = new StreamReader( FileSystem.Open(path) );
List<string> lines = new List<string>();
while( !reader.EndOfStream )
lines.Add(reader.ReadLine());
reader.Close();
return FromLines(lines.ToArray());
}
public static Dictionary<string, MiniYaml> FromFile( string path )
{
return FromLines(File.ReadAllLines( path ));
}

2
OpenRA.FileFormats/Session.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.FileFormats
public class Global
{
public string Map = "mods/ra/testmap.yaml";
public string Map = "testmap.yaml";
public string[] Packages = {}; // filename:sha1 pairs.
public string[] Mods = { "ra" }; // mod names
public int OrderLatency = 3;