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

tidy in Settings

Browse Source
This commit is contained in:
Chris Forbes
2011-11-26 15:54:43 +13:00
parent f043aa6366
commit 8bdab6a5f2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/GameRules/Settings.cs
View File

@@ -139,7 +139,6 @@ namespace OpenRA.GameRules
if (File.Exists(SettingsFile)) if (File.Exists(SettingsFile))
{ {
//Console.WriteLine("Loading settings file {0}",SettingsFile);
var yaml = MiniYaml.DictFromFile(SettingsFile); var yaml = MiniYaml.DictFromFile(SettingsFile);
foreach (var kv in Sections) foreach (var kv in Sections)
@@ -168,11 +167,11 @@ namespace OpenRA.GameRules
void LoadSectionYaml(MiniYaml yaml, object section) void LoadSectionYaml(MiniYaml yaml, object section)
{ {
object defaults = Activator.CreateInstance(section.GetType()); var defaults = Activator.CreateInstance(section.GetType());
FieldLoader.InvalidValueAction = (s,t,f) => FieldLoader.InvalidValueAction = (s,t,f) =>
{ {
object ret = defaults.GetType().GetField(f).GetValue(defaults); var ret = defaults.GetType().GetField(f).GetValue(defaults);
System.Console.WriteLine("FieldLoader: Cannot parse `{0}` into `{2}:{1}`; substituting default `{3}`".F(s,t.Name,f,ret) ); Console.WriteLine("FieldLoader: Cannot parse `{0}` into `{2}:{1}`; substituting default `{3}`".F(s,t.Name,f,ret) );
return ret; return ret;
}; };