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

Add sequence parameter to SpriteEffect.

Browse Source
This commit is contained in:
Paul Chote
2016-01-02 12:42:57 +00:00
parent 8d7ed98636
commit 6af377030c
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,13 +20,13 @@ namespace OpenRA.Effects
readonly WPos pos; readonly WPos pos;
readonly bool scaleSizeWithZoom; readonly bool scaleSizeWithZoom;
public SpriteEffect(WPos pos, World world, string image, string palette, bool scaleSizeWithZoom = false) public SpriteEffect(WPos pos, World world, string image, string sequence, string palette, bool scaleSizeWithZoom = false)
{ {
this.pos = pos; this.pos = pos;
this.palette = palette; this.palette = palette;
this.scaleSizeWithZoom = scaleSizeWithZoom; this.scaleSizeWithZoom = scaleSizeWithZoom;
anim = new Animation(world, image); anim = new Animation(world, image);
anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this))); anim.PlayThen(sequence, () => world.AddFrameEndTask(w => w.Remove(this)));
} }
public void Tick(World world) public void Tick(World world)

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

@@ -214,7 +214,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", "moveflash", true))); world.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, world, "moveflsh", "idle", "moveflash", true)));
flashed = true; flashed = true;
} }
} }

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

@@ -74,7 +74,7 @@ namespace OpenRA.Mods.Common.Traits
self.World.Map.CenterOfCell(cachedCell); self.World.Map.CenterOfCell(cachedCell);
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, info.Palette))); self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, self.World, info.Image, "idle", info.Palette)));
cachedPosition = self.CenterPosition; cachedPosition = self.CenterPosition;
ticks = 0; ticks = 0;

2
OpenRA.Mods.Common/Traits/SupportPowers/SpawnActorPower.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits
Game.Sound.Play(info.DeploySound, location); Game.Sound.Play(info.DeploySound, location);
if (!string.IsNullOrEmpty(info.EffectSequence) && !string.IsNullOrEmpty(info.EffectPalette)) if (!string.IsNullOrEmpty(info.EffectSequence) && !string.IsNullOrEmpty(info.EffectPalette))
w.Add(new SpriteEffect(location, w, info.EffectSequence, info.EffectPalette)); w.Add(new SpriteEffect(location, w, info.EffectSequence, "idle", info.EffectPalette));
var actor = w.CreateActor(info.Actor, new TypeDictionary var actor = w.CreateActor(info.Actor, new TypeDictionary
{ {