--- a/hedgewars/uAmmos.pas	Thu May 16 14:02:33 2013 -0400
+++ b/hedgewars/uAmmos.pas	Thu May 16 14:05:16 2013 -0400
@@ -278,9 +278,7 @@
                 PackAmmo(Ammo, Ammoz[AmmoType].Slot);
                 //SwitchNotHeldAmmo(Hedgehog);
                 if CurAmmoType = amKnife then LoadHedgehogHat(Hedgehog, Hedgehog.Hat);
-                if CurAmmoGear <> nil then 
-                    SetWeapon(CurAmmoGear^.AmmoType)
-                else CurAmmoType:= amNothing;
+                CurAmmoType:= amNothing
                 end
             end
     end;