Merge RulesetCache.LoadDefaultRules and LoadMapRules.

This commit is contained in:
Paul Chote
2015-07-05 13:22:29 +01:00
parent 86bf9086d9
commit 7d62ac2b12
9 changed files with 14 additions and 15 deletions

View File

@@ -39,14 +39,14 @@ namespace OpenRA.Mods.Common.UtilityCommands
Game.ModData = new ModData(srcMod);
GlobalFileSystem.LoadFromManifest(Game.ModData.Manifest);
var srcRules = Game.ModData.RulesetCache.LoadDefaultRules();
var srcRules = Game.ModData.RulesetCache.Load();
var srcPaletteInfo = srcRules.Actors["player"].Traits.Get<PlayerColorPaletteInfo>();
var srcRemapIndex = srcPaletteInfo.RemapIndex;
var destMod = args[2].Split(':')[0];
Game.ModData = new ModData(destMod);
GlobalFileSystem.LoadFromManifest(Game.ModData.Manifest);
var destRules = Game.ModData.RulesetCache.LoadDefaultRules();
var destRules = Game.ModData.RulesetCache.Load();
var destPaletteInfo = destRules.Actors["player"].Traits.Get<PlayerColorPaletteInfo>();
var destRemapIndex = destPaletteInfo.RemapIndex;
var shadowIndex = new int[] { };