Merge RulesetCache.LoadDefaultRules and LoadMapRules.

2015-07-05 13:22:29 +01:00
parent 86bf9086d9
commit 7d62ac2b12
9 changed files with 14 additions and 15 deletions
--- a/OpenRA.Mods.D2k/UtilityCommands/ImportD2kMapCommand.cs
+++ b/OpenRA.Mods.D2k/UtilityCommands/ImportD2kMapCommand.cs
@@ -23,7 +23,7 @@ namespace OpenRA.Mods.D2k.UtilityCommands
 			// HACK: The engine code assumes that Game.modData is set.
 			Game.ModData = modData;

-			var rules = Game.ModData.RulesetCache.LoadDefaultRules();
+			var rules = Game.ModData.RulesetCache.Load();

 			var map = D2kMapImporter.Import(args[1], modData.Manifest.Mod.Id, args[2], rules);