Mercurial Mercurial > sheepy-clone / 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.
Aaaand merge into trunk too in case guys I was playing earlier are on trunk
authornemo
Sat, 19 Nov 2011 15:36:33 -0500
changeset 6404 789c17eac2fe
parent 6401 b9d9024cf203 (current diff)
parent 6402 4670f003f91b (diff)
child 6406 3601b9f6df8c
child 6407 f63b2330147a
Aaaand merge into trunk too in case guys I was playing earlier are on trunk
CMakeLists.txt file | annotate | diff | comparison | revisions 
--- a/hedgewars/HHHandlers.inc	Sat Nov 19 22:42:52 2011 +0300
+++ b/hedgewars/HHHandlers.inc	Sat Nov 19 15:36:33 2011 -0500
@@ -1093,7 +1093,7 @@
     begin
     if Gear^.Timer = 0 then
         begin
-        Gear^.State:= Gear^.State and not (gstWait or gstLoser or gstWinner or gstAttacked or gstNotKickable);
+        Gear^.State:= Gear^.State and not (gstWait or gstLoser or gstWinner or gstAttacked or gstNotKickable or gstHHChooseTarget);
         Gear^.Active:= false;
         AddGearCI(Gear);
         exit
sheepy-clone