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

Remove World.TileSet.

Browse Source
This commit is contained in:
Paul Chote
2016-02-18 18:54:30 +00:00
parent 7993068c8f
commit 602acabe47
34 changed files with 59 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Traits/Minelayer.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Traits
{
this.self = self;
var tileset = self.World.TileSet.Id.ToLowerInvariant();
var tileset = self.World.Map.Tileset.ToLowerInvariant();
tile = self.World.Map.Rules.Sequences.GetSequence("overlay", "build-valid-{0}".F(tileset)).GetSprite(0);
}
@@ -140,7 +140,7 @@ namespace OpenRA.Mods.RA.Traits
minelayer = self;
minefieldStart = xy;
var tileset = self.World.TileSet.Id.ToLowerInvariant();
var tileset = self.World.Map.Tileset.ToLowerInvariant();
tileOk = self.World.Map.Rules.Sequences.GetSequence("overlay", "build-valid-{0}".F(tileset)).GetSprite(0);
tileBlocked = self.World.Map.Rules.Sequences.GetSequence("overlay", "build-invalid").GetSprite(0);
}

2
OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs
View File

@@ -195,7 +195,7 @@ namespace OpenRA.Mods.RA.Traits
var info = (ChronoshiftPowerInfo)power.Info;
range = info.Range;
var tileset = manager.Self.World.TileSet.Id.ToLowerInvariant();
var tileset = world.Map.Tileset.ToLowerInvariant();
validTile = world.Map.Rules.Sequences.GetSequence(info.OverlaySpriteGroup, info.ValidTileSequencePrefix + tileset).GetSprite(0);
invalidTile = world.Map.Rules.Sequences.GetSequence(info.OverlaySpriteGroup, info.InvalidTileSequence).GetSprite(0);
sourceTile = world.Map.Rules.Sequences.GetSequence(info.OverlaySpriteGroup, info.SourceTileSequence).GetSprite(0);