Merge RulesetCache.LoadDefaultRules and LoadMapRules.

OpenRA.Game/GameRules/RulesetCache.cs

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