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

Fix Smoke facings to not track spawner's facing

Browse Source
This commit is contained in:
reaperrr
2016-03-12 13:12:42 +01:00
parent c32bf9f8f7
commit d3ca9e1733
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Effects/Bullet.cs
View File

@@ -182,7 +182,7 @@ namespace OpenRA.Mods.Common.Effects
if (!string.IsNullOrEmpty(info.Trail) && --smokeTicks < 0) if (!string.IsNullOrEmpty(info.Trail) && --smokeTicks < 0)
{ {
var delayedPos = WPos.LerpQuadratic(args.Source, target, angle, ticks - info.TrailDelay, length); var delayedPos = WPos.LerpQuadratic(args.Source, target, angle, ticks - info.TrailDelay, length);
world.AddFrameEndTask(w => w.Add(new Smoke(w, delayedPos, () => GetEffectiveFacing(), info.Trail, trailPalette, info.TrailSequences.Random(world.SharedRandom)))); world.AddFrameEndTask(w => w.Add(new Smoke(w, delayedPos, GetEffectiveFacing(), info.Trail, trailPalette, info.TrailSequences.Random(world.SharedRandom))));
smokeTicks = info.TrailInterval; smokeTicks = info.TrailInterval;
} }

2
OpenRA.Mods.Common/Effects/Missile.cs
View File

@@ -805,7 +805,7 @@ namespace OpenRA.Mods.Common.Effects
// Create the smoke trail effect // Create the smoke trail effect
if (!string.IsNullOrEmpty(info.TrailImage) && --ticksToNextSmoke < 0 && (state != States.Freefall || info.TrailWhenDeactivated)) if (!string.IsNullOrEmpty(info.TrailImage) && --ticksToNextSmoke < 0 && (state != States.Freefall || info.TrailWhenDeactivated))
{ {
world.AddFrameEndTask(w => w.Add(new Smoke(w, pos - 3 * move / 2, () => renderFacing, info.TrailImage, trailPalette, info.TrailSequence))); world.AddFrameEndTask(w => w.Add(new Smoke(w, pos - 3 * move / 2, renderFacing, info.TrailImage, trailPalette, info.TrailSequence)));
ticksToNextSmoke = info.TrailInterval; ticksToNextSmoke = info.TrailInterval;
} }

6
OpenRA.Mods.Common/Effects/Smoke.cs
View File

@@ -24,15 +24,15 @@ namespace OpenRA.Mods.Common.Effects
readonly string palette; readonly string palette;
public Smoke(World world, WPos pos, string trail, string palette, string sequence) public Smoke(World world, WPos pos, string trail, string palette, string sequence)
: this(world, pos, () => 0, trail, palette, sequence) { } : this(world, pos, 0, trail, palette, sequence) { }
public Smoke(World world, WPos pos, Func<int> facingFunc, string trail, string palette, string sequence) public Smoke(World world, WPos pos, int facing, string trail, string palette, string sequence)
{ {
this.world = world; this.world = world;
this.pos = pos; this.pos = pos;
this.palette = palette; this.palette = palette;
anim = new Animation(world, trail, facingFunc); anim = new Animation(world, trail, () => facing);
anim.PlayThen(sequence, anim.PlayThen(sequence,
() => world.AddFrameEndTask(w => w.Remove(this))); () => world.AddFrameEndTask(w => w.Remove(this)));
} }

6
OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
readonly SmokeTrailWhenDamagedInfo info; readonly SmokeTrailWhenDamagedInfo info;
readonly BodyOrientation body; readonly BodyOrientation body;
readonly Func<int> getFacing; readonly int getFacing;
int ticks; int ticks;
public SmokeTrailWhenDamaged(Actor self, SmokeTrailWhenDamagedInfo info) public SmokeTrailWhenDamaged(Actor self, SmokeTrailWhenDamagedInfo info)
@@ -42,9 +42,9 @@ namespace OpenRA.Mods.Common.Traits
var facing = self.TraitOrDefault<IFacing>(); var facing = self.TraitOrDefault<IFacing>();
if (facing != null) if (facing != null)
getFacing = () => facing.Facing; getFacing = facing.Facing;
else else
getFacing = () => 0; getFacing = 0;
} }
public void Tick(Actor self) public void Tick(Actor self)