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

remove unused map overrides

Browse Source
This commit is contained in:
Bob
2010-08-27 15:24:37 +12:00
committed by Chris Forbes
parent 8dcd1e8fd1
commit baacfc96bb
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/GameRules/Rules.cs
View File

@@ -30,9 +30,9 @@ namespace OpenRA
public static void LoadRules(Manifest m, Map map) public static void LoadRules(Manifest m, Map map)
{ {
Info = LoadYamlRules(m.Rules, map.Rules, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y)); 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)); Weapons = LoadYamlRules(m.Weapons, new List<MiniYamlNode>(), (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
Voices = LoadYamlRules(m.Voices, map.Voices, (k, _) => new VoiceInfo(k.Value)); Voices = LoadYamlRules(m.Voices, new List<MiniYamlNode>(), (k, _) => new VoiceInfo(k.Value));
Music = LoadYamlRules(m.Music, map.Music, (k, _) => new MusicInfo(k.Key, 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); Movies = LoadYamlRules(m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
TileSets = new Dictionary<string, TileSet>(); TileSets = new Dictionary<string, TileSet>();

4
OpenRA.Game/Map.cs
View File

@@ -40,10 +40,6 @@ namespace OpenRA
// Rules overrides // Rules overrides
public List<MiniYamlNode> Rules = new List<MiniYamlNode>(); 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 // Binary map data
public byte TileFormat = 1; public byte TileFormat = 1;