--- a/hedgewars/HHHandlers.inc	Thu Sep 20 20:00:10 2007 +0000
+++ b/hedgewars/HHHandlers.inc	Fri Sep 21 18:55:44 2007 +0000
@@ -89,8 +89,8 @@
 
 procedure AfterAttack;
 begin
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^,
-     CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog] do
+with CurrentHedgehog^.Gear^,
+     CurrentHedgehog^ do
      begin
         Inc(AttacksNum);
         State:= State and not gstAttacking;
@@ -98,7 +98,7 @@
            else begin
            TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn;
            State:= State or gstAttacked;
-           OnUsedAmmo(CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog])
+           OnUsedAmmo(CurrentHedgehog^)
            end;
      AttackBar:= 0;
      end