# HG changeset patch
# User nemo
# Date 1381195888 14400
# Node ID 1813b682c6bd05336b1e86451cdbcf82d6e3f5db
# Parent  2fc346fadae3cfd0404da5c98c5d6997351a9c38
Issue #581

diff -r 2fc346fadae3 -r 1813b682c6bd hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Mon Oct 07 23:36:40 2013 +0400
+++ b/hedgewars/uGears.pas	Mon Oct 07 21:31:28 2013 -0400
@@ -401,7 +401,8 @@
             if (CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.State and gstAttacked = 0)
             and (CurAmmoGear = nil) then
                 SweepDirty;
-            CheckNoDamage;
+            if (CurrentHedgehog^.Gear = nil) or (CurrentHedgehog^.Gear^.State and gstHHDriven = 0) or (CurrentHedgehog^.Gear^.Damage = 0) then
+                CheckNoDamage;
             AliveCount:= 0; // shorter version of check for win to allow typical step activity to proceed
             for i:= 0 to Pred(ClansCount) do
                 if ClansArray[i]^.ClanHealth > 0 then