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

Merge RulesetCache.LoadDefaultRules and LoadMapRules.

Browse Source
This commit is contained in:
Paul Chote
2015-07-05 13:22:29 +01:00
parent 86bf9086d9
commit 7d62ac2b12
9 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/GameRules/RulesetCache.cs
View File

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

2
OpenRA.Game/Map/Map.cs
View File

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

2
OpenRA.Game/ModData.cs
View File

@@ -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;
}

2
OpenRA.Mods.Common/Lint/CheckMapRules.cs
View File

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

2
OpenRA.Mods.Common/UtilityCommands/ActorStatsExport.cs
View File

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

2
OpenRA.Mods.Common/UtilityCommands/ExtractLanguageStringsCommand.cs
View File

@@ -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())

2
OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs
View File

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

4
OpenRA.Mods.Common/UtilityCommands/RemapShpCommand.cs
View File

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

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

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