From 8bdab6a5f2fa63a6d8fc5061f1309d17470c20bb Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 26 Nov 2011 15:54:43 +1300 Subject: [PATCH] tidy in Settings --- OpenRA.Game/GameRules/Settings.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/GameRules/Settings.cs b/OpenRA.Game/GameRules/Settings.cs index 3932262047..96bf7c9990 100644 --- a/OpenRA.Game/GameRules/Settings.cs +++ b/OpenRA.Game/GameRules/Settings.cs @@ -139,7 +139,6 @@ namespace OpenRA.GameRules if (File.Exists(SettingsFile)) { - //Console.WriteLine("Loading settings file {0}",SettingsFile); var yaml = MiniYaml.DictFromFile(SettingsFile); foreach (var kv in Sections) @@ -168,11 +167,11 @@ namespace OpenRA.GameRules void LoadSectionYaml(MiniYaml yaml, object section) { - object defaults = Activator.CreateInstance(section.GetType()); + var defaults = Activator.CreateInstance(section.GetType()); FieldLoader.InvalidValueAction = (s,t,f) => { - object 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) ); + var ret = defaults.GetType().GetField(f).GetValue(defaults); + Console.WriteLine("FieldLoader: Cannot parse `{0}` into `{2}:{1}`; substituting default `{3}`".F(s,t.Name,f,ret) ); return ret; };