diff -r 9c097391d8f9 -r 600b64455337 hedgewars/uAmmos.pas
--- a/hedgewars/uAmmos.pas	Sun Sep 04 16:35:27 2011 -0400
+++ b/hedgewars/uAmmos.pas	Sun Sep 04 16:42:51 2011 -0400
@@ -215,7 +215,7 @@
 FillAmmoStore(hhammo, ammos);
 CurWeapon:= GetAmmoEntry(Hedgehog);
 with Hedgehog, CurWeapon^ do
-        if Count = 0 then
+        if (Count = 0) or (AmmoType = amNothing) then
             begin
             PackAmmo(Ammo, Ammoz[AmmoType].Slot);
             CurAmmoType:= amNothing