# HG changeset patch # User nemo # Date 1300761507 14400 # Node ID c772410270717c9f640f593ba8ca56744a9cb6b0 # Parent 1edc06d2247cc8373ea3140ccc3f45f431357af3 tweak to crosshair diff -r 1edc06d2247c -r c77241027071 hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Mon Mar 21 21:38:44 2011 +0300 +++ b/hedgewars/HHHandlers.inc Mon Mar 21 22:38:27 2011 -0400 @@ -390,12 +390,11 @@ begin if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft; TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 100; + if (CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) then + ShowCrosshair:= (Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoCrossHair) = 0 + else ShowCrosshair:= false; end; if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) then State:= State or gstAttacked; - if (CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) then - ShowCrosshair:= (Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoCrossHair) = 0 - else - ShowCrosshair:= (Ammoz[a].Ammo.Propz and ammoprop_NoCrosshair) = 0; if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then ApplyAmmoChanges(CurrentHedgehog^) end; end