Merge RulesetCache.LoadDefaultRules and LoadMapRules.

OpenRA.Game/GameRules/RulesetCache.cs

@@ -43,12 +43,11 @@ namespace OpenRA
 			this.modData = modData;
 		}
 
-		public Ruleset LoadDefaultRules()
+		/// <summary>
-		{
+		/// Cache and return the Ruleset for a given map.
-			return LoadMapRules(null);
+		/// If a map isn't specified then return the default mod Ruleset.
-		}
+		/// </summary>
-
+		public Ruleset Load(Map map = null)
-		public Ruleset LoadMapRules(Map map)
 		{
 			var m = modData.Manifest;
 

OpenRA.Game/Map/Map.cs

@@ -387,7 +387,7 @@ namespace OpenRA
 			{
 				try
 				{
-					return Game.ModData.RulesetCache.LoadMapRules(this);
+					return Game.ModData.RulesetCache.Load(this);
 				}
 				catch (Exception e)
 				{

OpenRA.Game/ModData.cs

@@ -79,7 +79,7 @@ namespace OpenRA
 			foreach (var dir in Manifest.Folders)
 				GlobalFileSystem.Mount(dir);
 
-			defaultRules = Exts.Lazy(() => RulesetCache.LoadDefaultRules());
+			defaultRules = Exts.Lazy(() => RulesetCache.Load());
 
 			initialThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId;
 		}

OpenRA.Mods.Common/Lint/CheckMapRules.cs

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Lint
 		{
 			try
 			{
-				Game.ModData.RulesetCache.LoadMapRules(map);
+				Game.ModData.RulesetCache.Load(map);
 			}
 			catch (Exception e)
 			{

OpenRA.Mods.Common/UtilityCommands/ActorStatsExport.cs

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 	{
 		public static DataTable GenerateTable()
 		{
-			var rules = Game.ModData.RulesetCache.LoadDefaultRules();
+			var rules = Game.ModData.RulesetCache.Load();
 
 			var table = new DataTable();
 			table.Columns.Add("Name", typeof(string));

OpenRA.Mods.Common/UtilityCommands/ExtractLanguageStringsCommand.cs

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 		{
 			// HACK: The engine code assumes that Game.modData is set.
 			Game.ModData = modData;
-			Game.ModData.RulesetCache.LoadDefaultRules();
+			Game.ModData.RulesetCache.Load();
 
 			var types = Game.ModData.ObjectCreator.GetTypes();
 			var translatableFields = types.SelectMany(t => t.GetFields())

OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.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 = LegacyMapImporter.Import(args[1], modData.Manifest.Mod.Id, rules, Console.WriteLine);
 
 			var fileName = Path.GetFileNameWithoutExtension(args[1]);

OpenRA.Mods.Common/UtilityCommands/RemapShpCommand.cs

@@ -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[] { };

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);