--- a/hedgewars/uAmmos.pas	Fri Aug 26 20:59:55 2011 -0400
+++ b/hedgewars/uAmmos.pas	Fri Aug 26 21:38:11 2011 -0400
@@ -184,8 +184,9 @@
     a: PAmmo;
 begin
 a:= GetAmmoEntry(Hedgehog, ammo);
-cnt:= a^.Count;
-if (a^.AmmoType = amNothing) or (cnt <> AMMO_INFINITE) then
+if (a^.AmmoType <> amNothing) then cnt:= a^.Count
+else cnt:= 0;
+if (cnt <> AMMO_INFINITE) then
     begin
     inc(cnt, Ammoz[ammo].NumberInCase);
     AddAmmo(Hedgehog, ammo, cnt)