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