# HG changeset patch # User nemo # Date 1321734993 18000 # Node ID 789c17eac2fe1b956e2786aa05f3aca62b4ffc81 # Parent b9d9024cf20380880ceadde755a7f25048bd5f3b# Parent 4670f003f91b3246665ca0de95fa056d2d2f3f54 Aaaand merge into trunk too in case guys I was playing earlier are on trunk diff -r b9d9024cf203 -r 789c17eac2fe CMakeLists.txt diff -r b9d9024cf203 -r 789c17eac2fe hedgewars/HHHandlers.inc --- 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