From baacfc96bb7a604c388935ca725c60fe800d4d5a Mon Sep 17 00:00:00 2001
From: Bob <ytinasni@gmail.com>
Date: Fri, 27 Aug 2010 15:24:37 +1200
Subject: [PATCH] remove unused map overrides

---
 OpenRA.Game/GameRules/Rules.cs | 6 +++---
 OpenRA.Game/Map.cs             | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/OpenRA.Game/GameRules/Rules.cs b/OpenRA.Game/GameRules/Rules.cs
index ff2e024fd9..c8881563aa 100755
--- a/OpenRA.Game/GameRules/Rules.cs
+++ b/OpenRA.Game/GameRules/Rules.cs
@@ -30,9 +30,9 @@ namespace OpenRA
 		public static void LoadRules(Manifest m, Map map)
 		{
 			Info = LoadYamlRules(m.Rules, map.Rules, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
-			Weapons = LoadYamlRules(m.Weapons, map.Weapons, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
-			Voices = LoadYamlRules(m.Voices, map.Voices, (k, _) => new VoiceInfo(k.Value));
-			Music = LoadYamlRules(m.Music, map.Music, (k, _) => new MusicInfo(k.Key, k.Value));
+			Weapons = LoadYamlRules(m.Weapons, new List<MiniYamlNode>(), (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+			Voices = LoadYamlRules(m.Voices, new List<MiniYamlNode>(), (k, _) => new VoiceInfo(k.Value));
+			Music = LoadYamlRules(m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
 			Movies = LoadYamlRules(m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
 			
 			TileSets = new Dictionary<string, TileSet>();
diff --git a/OpenRA.Game/Map.cs b/OpenRA.Game/Map.cs
index 996f2ba5b6..721158f800 100755
--- a/OpenRA.Game/Map.cs
+++ b/OpenRA.Game/Map.cs
@@ -40,11 +40,7 @@ namespace OpenRA
 
 		// Rules overrides
 		public List<MiniYamlNode> Rules = new List<MiniYamlNode>();
-		public List<MiniYamlNode> Weapons = new List<MiniYamlNode>();
-		public List<MiniYamlNode> Voices = new List<MiniYamlNode>();
-		public List<MiniYamlNode> Music = new List<MiniYamlNode>();
-		public List<MiniYamlNode> Terrain = new List<MiniYamlNode>();
-		
+
 		// Binary map data
 		public byte TileFormat = 1;
 		public int2 MapSize;