hedgewars/uAmmos.pas
changeset 4807 180dbfb13903
parent 4403 0dfe26f48ec1
child 4808 7c3e5b52344a
--- a/hedgewars/uAmmos.pas	Sat Jan 01 23:10:57 2011 +0100
+++ b/hedgewars/uAmmos.pas	Sun Jan 02 13:54:28 2011 +0100
@@ -320,15 +320,12 @@
 
     with CurWeapon^ do
         begin
-        if AmmoType <> amNothing then
-            begin
-            s:= trammo[Ammoz[AmmoType].NameId];
-            if (Count <> AMMO_INFINITE) and not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0)) then
-                s:= s + ' (' + IntToStr(Count) + ')';
-            if (Propz and ammoprop_Timerable) <> 0 then
-                s:= s + ', ' + IntToStr(Timer div 1000) + ' ' + trammo[sidSeconds];
-            AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo);
-            end;
+        s:= trammo[Ammoz[AmmoType].NameId];
+        if (Count <> AMMO_INFINITE) and not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0)) then
+            s:= s + ' (' + IntToStr(Count) + ')';
+        if (Propz and ammoprop_Timerable) <> 0 then
+            s:= s + ', ' + IntToStr(Timer div 1000) + ' ' + trammo[sidSeconds];
+        AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo);
         if (Propz and ammoprop_NeedTarget) <> 0
             then begin
             Gear^.State:= Gear^.State or      gstHHChooseTarget;