--- a/hedgewars/uAmmos.pas	Fri Sep 09 04:39:17 2011 +0200
+++ b/hedgewars/uAmmos.pas	Fri Sep 09 05:15:45 2011 +0200
@@ -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