# HG changeset patch # User nemo # Date 1309320326 14400 # Node ID e2201f71beac7606abd59982312a292854a30a11 # Parent 9e0c51a882aa588a6318784354bfc6678f2efbba call onusedammo earlier for switcher diff -r 9e0c51a882aa -r e2201f71beac hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Tue Jun 28 23:32:42 2011 -0400 +++ b/hedgewars/GSHandlers.inc Wed Jun 29 00:05:26 2011 -0400 @@ -2565,7 +2565,6 @@ HHGear := Gear^.Hedgehog^.Gear; Msg := Gear^.Message and not gmSwitch; DeleteGear(Gear); - OnUsedAmmo(HHGear^.Hedgehog^); ApplyAmmoChanges(HHGear^.Hedgehog^); HHGear := CurrentHedgehog^.Gear; @@ -2614,6 +2613,7 @@ Gear^.doStep := @doStepSwitcherWork; HHGear := Gear^.Hedgehog^.Gear; + OnUsedAmmo(HHGear^.Hedgehog^); with HHGear^ do begin State := State and not gstAttacking;