Remove RulesetCache and push rule parsing to background thread.

2016-03-11 18:31:43 +00:00
parent a3b1baa654
commit 82a9d69a51
10 changed files with 139 additions and 182 deletions
--- a/OpenRA.Game/Map/Map.cs
+++ b/OpenRA.Game/Map/Map.cs
@@ -295,7 +295,7 @@ namespace OpenRA
 			{
 				try
 				{
-					return modData.RulesetCache.Load(this, this);
+					return Ruleset.LoadFromMap(modData, this);
 				}
 				catch (Exception e)
 				{
@@ -303,7 +303,7 @@ namespace OpenRA
 					Log.Write("debug", "Failed to load rules for {0} with error {1}", Title, e.Message);
 				}

-				return modData.DefaultRules;
+				return Ruleset.LoadDefaultsForTileSet(modData, Tileset);
 			});

 			var tl = new MPos(0, 0).ToCPos(this);