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

Move SpriteEffect facing parameter to the end

Browse Source 
To avoid potential incompatibilities with downstream projects.
This commit is contained in:
reaperrr
2016-05-20 23:24:33 +02:00
parent 62aabffed9
commit dbd7606667
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Effects/SpriteEffect.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Effects
readonly bool visibleThroughFog; readonly bool visibleThroughFog;
readonly bool scaleSizeWithZoom; readonly bool scaleSizeWithZoom;
public SpriteEffect(WPos pos, World world, string image, string sequence, string palette, int facing = 0, bool visibleThroughFog = false, bool scaleSizeWithZoom = false) public SpriteEffect(WPos pos, World world, string image, string sequence, string palette, bool visibleThroughFog = false, bool scaleSizeWithZoom = false, int facing = 0)
{ {
this.world = world; this.world = world;
this.pos = pos; this.pos = pos;

2
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -199,7 +199,7 @@ namespace OpenRA.Widgets
else if (o.TargetLocation != CPos.Zero) else if (o.TargetLocation != CPos.Zero)
{ {
var pos = world.Map.CenterOfCell(cell); var pos = world.Map.CenterOfCell(cell);
world.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, world, "moveflsh", "idle", "moveflash", 0, true, true))); world.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, world, "moveflsh", "idle", "moveflash", true, true)));
flashed = true; flashed = true;
} }
} }

2
OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs
View File

@@ -119,7 +119,7 @@ namespace OpenRA.Mods.Common.Traits.Render
if (Info.TerrainTypes.Contains(type) && !string.IsNullOrEmpty(Info.Image)) if (Info.TerrainTypes.Contains(type) && !string.IsNullOrEmpty(Info.Image))
self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, self.World, Info.Image, self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, self.World, Info.Image,
Info.Sequences.Random(Game.CosmeticRandom), Info.Palette, spawnFacing, Info.VisibleThroughFog))); Info.Sequences.Random(Game.CosmeticRandom), Info.Palette, Info.VisibleThroughFog, false, spawnFacing)));
cachedPosition = self.CenterPosition; cachedPosition = self.CenterPosition;
cachedFacing = facing != null ? facing.Facing : 0; cachedFacing = facing != null ? facing.Facing : 0;