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

fixed #934 -- convert all AttackBase.MuzzleFlash uses to WithMuzzleFlash

Browse Source
This commit is contained in:
Chris Forbes
2011-06-25 11:51:04 +12:00
parent 29b81be5bb
commit 6be55b61aa
4 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.RA/Render/RenderUnitTurreted.cs
View File

@@ -26,7 +26,6 @@ namespace OpenRA.Mods.RA.Render
var facing = self.Trait<IFacing>();
var turreted = self.Trait<Turreted>();
var attack = self.TraitOrDefault<AttackBase>();
var attackInfo = self.Info.Traits.Get<AttackBaseInfo>();
var turretAnim = new Animation(GetImage(self), () => turreted.turretFacing );
turretAnim.Play( "turret" );
@@ -38,17 +37,6 @@ namespace OpenRA.Mods.RA.Render
new AnimationWithOffset( turretAnim,
() => Combat.GetTurretPosition( self, facing, turret ),
null));
if (attackInfo.MuzzleFlash)
{
var muzzleFlash = new Animation(GetImage(self), () => turreted.turretFacing);
muzzleFlash.PlayFetchIndex("muzzle",
() => (int)(turret.Recoil * 5.9f)); /* hack: dumb crap */
anims.Add("muzzle_flash_{0}".F(i),
new AnimationWithOffset(muzzleFlash,
() => Combat.GetTurretPosition(self, facing, turret),
() => turret.Recoil <= 0));
}
}
}
}