diff -r d2405a6a86f5 -r 57b66ee3bff3 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Tue Apr 24 23:33:39 2012 +0400
+++ b/hedgewars/GSHandlers.inc	Tue Apr 24 23:50:40 2012 +0400
@@ -3973,7 +3973,7 @@
                     begin
                     CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and (not gmSwitch);
                 
-                    CurWeapon:= GetAmmoEntry(CurrentHedgehog^);
+                    CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
                     if CurWeapon^.Pos <> 0 then
                         CurWeapon^.Pos := 0
                         
@@ -4344,7 +4344,7 @@
     if CurrentHedgehog <> nil then
         with CurrentHedgehog^ do
             begin
-            CurWeapon:= GetAmmoEntry(CurrentHedgehog^);
+            CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
             if (CurAmmoType = amPortalGun) then
                 begin
                 if not destroyGear then
@@ -4444,7 +4444,7 @@
     if CurrentHedgehog <> nil then
         with CurrentHedgehog^ do
             begin
-            CurWeapon:= GetAmmoEntry(CurrentHedgehog^);
+            CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
             // let's save the HH's dX's direction so we can decide where the "top" of the portal hole
             newPortal^.Elasticity.isNegative := CurrentHedgehog^.Gear^.dX.isNegative;
             // when doing a backjump the dx is the opposite of the facing direction