# HG changeset patch
# User nemo
# Date 1265644603 0
# Node ID 82bfcc006afb8db3d2216f2fa7860ae3c4acf9f0
# Parent  b7e0b075117979e8dfd171eb5358ba632947d641
Some handling of interaction between king mode and place hogs mode.

diff -r b7e0b0751179 -r 82bfcc006afb hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Mon Feb 08 12:54:44 2010 +0000
+++ b/hedgewars/HHHandlers.inc	Mon Feb 08 15:56:43 2010 +0000
@@ -269,6 +269,7 @@
 const frametime = 200;
       timertime = frametime * 6;
 begin
+if PHedgehog(Gear^.Hedgehog)^.Unplaced then exit;
 if Gear^.Timer > 1 then
 	begin
 	AllInactive:= false;
diff -r b7e0b0751179 -r 82bfcc006afb hedgewars/uAmmos.pas
--- a/hedgewars/uAmmos.pas	Mon Feb 08 12:54:44 2010 +0000
+++ b/hedgewars/uAmmos.pas	Mon Feb 08 15:56:43 2010 +0000
@@ -126,7 +126,7 @@
         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 (Ammoz[a].SkipTurns = 0) and (a <> amTeleport) and (a <> amSkip) then 
+        if ((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0) and (Ammoz[a].SkipTurns = 0) and (a <> amTeleport) and (a <> amSkip) then 
             Ammoz[a].SkipTurns:= 1;
 
         if ((GameFlags and gfPlaceHog) <> 0) and