diff -r 97827ad5c904 -r 948da1e50205 hedgewars/uGearsRender.pas --- a/hedgewars/uGearsRender.pas Sun Apr 10 20:02:25 2011 +0200 +++ b/hedgewars/uGearsRender.pas Sun Apr 10 14:04:56 2011 -0400 @@ -259,7 +259,11 @@ if (Gear^.State and gstHHDriven) <> 0 then begin if ((Gear^.State and gstHHThinking) = 0) and - ShowCrosshair 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 + ((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 gstAnimation) = 0) then begin (* These calculations are a little complex for a few reasons: