# HG changeset patch
# User sheepluva
# Date 1316467513 -7200
# Node ID e529b28d10e93e6c1cbe23175e51b7f10993358b
# Parent  44d2dc3b438f7581dfd03d8475d2516770c00f92# Parent  07f6fa51ea5842e8124eea569c2afaceb9249011
merge the 2 heads. I hope I did it right. also I increased proto and ver number

diff -r 44d2dc3b438f -r e529b28d10e9 CMakeLists.txt
--- a/CMakeLists.txt	Mon Sep 19 14:17:33 2011 -0400
+++ b/CMakeLists.txt	Mon Sep 19 23:25:13 2011 +0200
@@ -41,8 +41,8 @@
 #versioning
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
-set(CPACK_PACKAGE_VERSION_PATCH 16${version_suffix})
-set(HEDGEWARS_PROTO_VER 39)
+set(CPACK_PACKAGE_VERSION_PATCH 17${version_suffix})
+set(HEDGEWARS_PROTO_VER 40)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 
diff -r 44d2dc3b438f -r e529b28d10e9 hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Mon Sep 19 14:17:33 2011 -0400
+++ b/hedgewars/HHHandlers.inc	Mon Sep 19 23:25:13 2011 +0200
@@ -1077,13 +1077,13 @@
 if ((Gear^.State and gstWait) = 0) and
     (prevState <> Gear^.State) then
     begin
-    Gear^.State:= gstWait;
+    Gear^.State:= Gear^.State or gstWait;
     Gear^.Timer:= 150
     end else
     begin
     if Gear^.Timer = 0 then
         begin
-        Gear^.State:= 0;
+        Gear^.State:= Gear^.State and not gstWait;
         Gear^.Active:= false;
         AddGearCI(Gear);
         exit
@@ -1107,7 +1107,9 @@
 else
     begin
     with Gear^.Hedgehog^ do
-        if Team^.hasGone then TeamGoneEffect(Team^);
-    doStepHedgehogDriven(Gear)
+        if Team^.hasGone then
+            TeamGoneEffect(Team^)
+        else
+            doStepHedgehogDriven(Gear)
     end;
 end;
diff -r 44d2dc3b438f -r e529b28d10e9 hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas	Mon Sep 19 14:17:33 2011 -0400
+++ b/hedgewars/uTeams.pas	Mon Sep 19 23:25:13 2011 +0200
@@ -430,7 +430,8 @@
             if Gear <> nil then
                 begin
                 Gear^.Invulnerable:= false;
-                Gear^.Damage:= Gear^.Health
+                Gear^.Damage:= Gear^.Health;
+                Gear^.State:= (Gear^.State or gstHHGone) and not gstHHDriven
                 end
 end;