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

WithMuzzleFlash: fix loop variable in closure hazard

Browse Source 
This fixes a real bug -- if the actor had multiple armaments, we'd end
up placing the muzzle flashes all based on the offsets of the last one.
This commit is contained in:
Chris Forbes
2014-10-07 18:27:31 +13:00
parent 98563eb854
commit 3360b11962
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Render/WithMuzzleFlash.cs
View File

@@ -38,6 +38,8 @@ namespace OpenRA.Mods.RA.Render
foreach (var arm in self.TraitsImplementing<Armament>()) foreach (var arm in self.TraitsImplementing<Armament>())
{ {
var armClosure = arm; // closure hazard in AnimationWithOffset
// Skip armaments that don't define muzzles // Skip armaments that don't define muzzles
if (arm.Info.MuzzleSequence == null) if (arm.Info.MuzzleSequence == null)
continue; continue;
@@ -55,7 +57,7 @@ namespace OpenRA.Mods.RA.Render
visible.Add(barrel, false); visible.Add(barrel, false);
anims.Add(barrel, anims.Add(barrel,
new AnimationWithOffset(muzzleFlash, new AnimationWithOffset(muzzleFlash,
() => info.IgnoreOffset ? WVec.Zero : arm.MuzzleOffset(self, barrel), () => info.IgnoreOffset ? WVec.Zero : armClosure.MuzzleOffset(self, barrel),
() => !visible[barrel], () => !visible[barrel],
() => false, () => false,
p => WithTurret.ZOffsetFromCenter(self, p, 2))); p => WithTurret.ZOffsetFromCenter(self, p, 2)));