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

Merge ModRuleset and MapRuleset into Ruleset

Browse Source
This commit is contained in:
Pavlos Touboulidis
2014-05-10 10:29:26 +03:00
parent 48d1dde8a7
commit 750fc4e02c
18 changed files with 54 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,8 +111,8 @@ namespace OpenRA
[FieldLoader.Ignore] public Lazy<TileReference<byte, byte>[,]> MapResources;
[FieldLoader.Ignore] public string[,] CustomTerrain;
[FieldLoader.Ignore] Lazy<MapRuleset> rules;
public MapRuleset Rules { get { return rules != null ? rules.Value : null; } }
[FieldLoader.Ignore] Lazy<Ruleset> rules;
public Ruleset Rules { get { return rules != null ? rules.Value : null; } }
public SequenceProvider SequenceProvider { get; private set; }
public static Map FromTileset(TileSet tileset)
@@ -249,7 +249,7 @@ namespace OpenRA
SequenceProvider = new SequenceProvider(this);
}
public MapRuleset PreloadRules()
public Ruleset PreloadRules()
{
return rules.Value;
}
@@ -508,7 +508,7 @@ namespace OpenRA
});
}
public void FixOpenAreas(MapRuleset rules)
public void FixOpenAreas(Ruleset rules)
{
var r = new Random();
var tileset = rules.TileSets[Tileset];