epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10909 from pchote/remove-ruleset-cache

Browse Source 
Remove ruleset cache
This commit is contained in:
abcdefg30
2016-03-12 20:41:03 +01:00
parent 6c4d24e505 82a9d69a51
commit d7bdc840d6
22 changed files with 194 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs
View File

@@ -308,7 +308,7 @@ namespace OpenRA.Mods.D2k.UtilityCommands
{
mapSize = new Size(stream.ReadUInt16(), stream.ReadUInt16());
tileSet = rules.TileSets["ARRAKIS"];
tileSet = Game.ModData.DefaultTileSets["ARRAKIS"];
map = new Map(Game.ModData, tileSet, mapSize.Width + 2 * MapCordonWidth, mapSize.Height + 2 * MapCordonWidth)
{

3
OpenRA.Mods.D2k/UtilityCommands/ImportD2kMapCommand.cs
View File

@@ -30,8 +30,7 @@ namespace OpenRA.Mods.D2k.UtilityCommands
// HACK: The engine code assumes that Game.modData is set.
Game.ModData = modData;
var rules = modData.RulesetCache.Load(modData.DefaultFileSystem);
var rules = Ruleset.LoadDefaultsForTileSet(modData, "ARRAKIS");
var map = D2kMapImporter.Import(args[1], modData.Manifest.Mod.Id, args[2], rules);
if (map == null)