# HG changeset patch
# User nemo
# Date 1264966363 0
# Node ID d893901eff4a07d90ef5beb5b9fe737daf65d083
# Parent  9f5548ce70e4e78bca4b2c83c8f11d6fd7600e9c
Only add turn timeout for weapons that don't already have a timeout

diff -r 9f5548ce70e4 -r d893901eff4a hedgewars/uAmmos.pas
--- a/hedgewars/uAmmos.pas	Sun Jan 31 19:25:31 2010 +0000
+++ b/hedgewars/uAmmos.pas	Sun Jan 31 19:32:43 2010 +0000
@@ -108,7 +108,8 @@
         ammos[a]:= cnt;
         if shoppa then Ammoz[a].NumberInCase:= 1;  // FIXME - TEMPORARY remove when crate number in case editor is added
 
-        if ((GameFlags and gfKing) <> 0) and (a <> amTeleport) and (a <> amSkip) then Ammoz[a].SkipTurns:= 1;
+        if ((GameFlags and gfKing) <> 0) and (Ammoz[a].SkipTurns = 0) and (a <> amTeleport) and (a <> amSkip) then 
+            Ammoz[a].SkipTurns:= 1;
         end else
         ammos[a]:= AMMO_INFINITE
     end;