Merge branch 'master' of git://github.com/chrisforbes/OpenRA

2009-12-18 19:07:31 -08:00
parent fce0a8787d 02a9ef5920
commit df1c0a7781
1 changed files with 2 additions and 1 deletions
--- a/OpenRa.Game/GameRules/Rules.cs
+++ b/OpenRa.Game/GameRules/Rules.cs
@@ -48,7 +48,8 @@ namespace OpenRa.Game
 			FieldLoader.Load(General, AllRules.GetSection("General"));

            Aftermath = new AftermathInfo();
-            FieldLoader.Load(Aftermath, AllRules.GetSection("Aftermath"));
+			if (useAftermath)
+				FieldLoader.Load(Aftermath, AllRules.GetSection("Aftermath"));

 			LoadCategories(
 				"Building",