Mercurial Mercurial > hedgewars-draft / 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.
Don't reset attack when Unplaced.
authornemo
Sun, 07 Aug 2011 11:23:27 -0400
changeset 5509 3b344484883e
parent 5507 1040c0946ef8
child 5511 13a222b00a9d
Don't reset attack when Unplaced.
hedgewars/uGears.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGears.pas	Sun Aug 07 11:18:49 2011 -0400
+++ b/hedgewars/uGears.pas	Sun Aug 07 11:23:27 2011 -0400
@@ -915,7 +915,7 @@
         begin
         dec(delay2);
 
-        if ((delay2 mod cInactDelay) = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) then
+        if ((delay2 mod cInactDelay) = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and not CurrentHedgehog^.Unplaced then
             begin
             if (CurrentHedgehog^.Gear^.State and gstAttacked <> 0) and (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0) then
                 begin
hedgewars-draft