# HG changeset patch # User nemo # Date 1387737868 18000 # Node ID c740c865294d052cb3b90aee300c6414d1755f69 # Parent 4132b0bfcac5453e9a8f894ba0e6cf57be30adff Graves should not be kicked for EXPLDoNotTouchAny diff -r 4132b0bfcac5 -r c740c865294d hedgewars/uGearsUtils.pas --- a/hedgewars/uGearsUtils.pas Sun Dec 22 08:37:10 2013 -0500 +++ b/hedgewars/uGearsUtils.pas Sun Dec 22 13:44:28 2013 -0500 @@ -158,19 +158,20 @@ end; end; - gtGrave: begin + gtGrave: if Mask and EXPLDoNotTouchAny = 0 then // Run the calcs only once we know we have a type that will need damage - tdX:= Gear^.X-fX; - tdY:= Gear^.Y-fY; - if LongInt(tdX.Round + tdY.Round + 2) < dmgBase then - dmg:= dmgBase - hwRound(Distance(tdX, tdY)); - if dmg > 1 then begin - dmg:= ModifyDamage(min(dmg div 2, Radius), Gear); - Gear^.dY:= - _0_004 * dmg; - Gear^.Active:= true - end - end; + tdX:= Gear^.X-fX; + tdY:= Gear^.Y-fY; + if LongInt(tdX.Round + tdY.Round + 2) < dmgBase then + dmg:= dmgBase - hwRound(Distance(tdX, tdY)); + if dmg > 1 then + begin + dmg:= ModifyDamage(min(dmg div 2, Radius), Gear); + Gear^.dY:= - _0_004 * dmg; + Gear^.Active:= true + end + end; end; end; Gear:= Gear^.NextGear