diff -r 095273ad0e08 -r e5b3e5f2818e hedgewars/CCHandlers.inc
--- a/hedgewars/CCHandlers.inc	Sat May 01 21:54:08 2010 +0000
+++ b/hedgewars/CCHandlers.inc	Sun May 02 02:58:59 2010 +0000
@@ -633,8 +633,9 @@
             bSelected:= false;
 
             if bShowAmmoMenu then bShowAmmoMenu:= false
-            else if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or (MultiShootAttacks > 0)
-                or ((Gear^.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true
+            else if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or 
+                    ((MultiShootAttacks > 0) and ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_NoRoundEndHint) = 0)) or
+                    ((Gear^.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true
             end
 end;