# HG changeset patch # User sheepluva # Date 1408626079 -7200 # Node ID 13bfbade06a55dd56d9aa01158e845bd22aa5f95 # Parent 2f5941a056562cf7447a0977ced44d63dd82fb89 don't render crosshair/laser during kamikaze diff -r 2f5941a05656 -r 13bfbade06a5 hedgewars/uGearsRender.pas --- a/hedgewars/uGearsRender.pas Fri Aug 15 08:31:34 2014 +0200 +++ b/hedgewars/uGearsRender.pas Thu Aug 21 15:01:19 2014 +0200 @@ -314,6 +314,8 @@ if ((Gear^.State and (gstHHThinking or gstAnimation)) = 0) and /// If current ammo is active, and current ammo has alt attack and uses a crosshair (rope, basically, right now, with no crosshair for parachute/saucer (((CurAmmoGear <> nil) and //((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) and + // don't render crosshair/laser during kamikaze + ((CurAmmoGear^.AmmoType <> amKamikaze) or ((Gear^.State and gstAttacking) = 0)) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoCrossHair) = 0)) or /// If no current ammo is active, and the selected ammo uses a crosshair ((CurAmmoGear = nil) and ((Ammoz[HH^.CurAmmoType].Ammo.Propz and ammoprop_NoCrosshair) = 0) and ((Gear^.State and gstAttacked) = 0))) then