hedgewars/uGears.pas
changeset 9497 1813b682c6bd
parent 9317 a04c30940d2d
child 9521 8054d9d775fd
child 9573 49bca2fabbd3
equal deleted inserted replaced
9495:2fc346fadae3 9497:1813b682c6bd
   399         if delay2 = 0 then
   399         if delay2 = 0 then
   400             begin
   400             begin
   401             if (CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.State and gstAttacked = 0)
   401             if (CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.State and gstAttacked = 0)
   402             and (CurAmmoGear = nil) then
   402             and (CurAmmoGear = nil) then
   403                 SweepDirty;
   403                 SweepDirty;
   404             CheckNoDamage;
   404             if (CurrentHedgehog^.Gear = nil) or (CurrentHedgehog^.Gear^.State and gstHHDriven = 0) or (CurrentHedgehog^.Gear^.Damage = 0) then
       
   405                 CheckNoDamage;
   405             AliveCount:= 0; // shorter version of check for win to allow typical step activity to proceed
   406             AliveCount:= 0; // shorter version of check for win to allow typical step activity to proceed
   406             for i:= 0 to Pred(ClansCount) do
   407             for i:= 0 to Pred(ClansCount) do
   407                 if ClansArray[i]^.ClanHealth > 0 then
   408                 if ClansArray[i]^.ClanHealth > 0 then
   408                     inc(AliveCount);
   409                     inc(AliveCount);
   409             if (AliveCount <= 1) and ((GameFlags and gfOneClanMode) = 0) then
   410             if (AliveCount <= 1) and ((GameFlags and gfOneClanMode) = 0) then