Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only add turn timeout for weapons that don't already have a timeout
authornemo
Sun, 31 Jan 2010 19:32:43 +0000
changeset 2732 d893901eff4a
parent 2731 9f5548ce70e4
child 2733 52a5a160566f
Only add turn timeout for weapons that don't already have a timeout
hedgewars/uAmmos.pas file | annotate | diff | comparison | revisions 
--- 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;
hedgewars