# HG changeset patch # User nemo # Date 1273115562 0 # Node ID e36dffdf7b82f121f964adf50bb98aab26d6a352 # Parent 21c08c95a672199a5d10a3535bbb22cc25b70e27 trying to unbreak what I broke diff -r 21c08c95a672 -r e36dffdf7b82 hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Thu May 06 02:00:39 2010 +0000 +++ b/hedgewars/GSHandlers.inc Thu May 06 03:12:42 2010 +0000 @@ -1937,9 +1937,6 @@ else begin PlaySound(sndPlaced); DeleteGear(Gear); - //Using these two instead means girder stays active without needing to reselect it - //OnUsedAmmo(PHedgehog(HHGear^.Hedgehog)^); - //ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^) AfterAttack; end; diff -r 21c08c95a672 -r e36dffdf7b82 hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Thu May 06 02:00:39 2010 +0000 +++ b/hedgewars/HHHandlers.inc Thu May 06 03:12:42 2010 +0000 @@ -277,14 +277,17 @@ end else begin - OnUsedAmmo(CurrentHedgehog^); if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_NoRoundEndHint) = 0 then begin + OnUsedAmmo(CurrentHedgehog^); TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn; State:= State or gstAttacked end else - ApplyAmmoChanges(CurrentHedgehog^); + begin + OnUsedAmmo(CurrentHedgehog^); + ApplyAmmoChanges(CurrentHedgehog^) + end end; end else