diff -r 772b37c9c3ba -r 56cbc035b74b hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Fri Jun 18 14:22:14 2010 -0400 +++ b/hedgewars/GSHandlers.inc Fri Jun 18 14:26:04 2010 -0400 @@ -812,7 +812,7 @@ end; if CheckLandValue(hwRound(Gear^.X + Gear^.dX + SignAs(_6,Gear^.dX)), hwRound(Gear^.Y + _1_9) - , LAND_INDESTRUCTIBLE) then + , lfIndestructible) then begin Gear^.X := Gear^.X + Gear^.dX; Gear^.Y := Gear^.Y + _1_9; @@ -922,11 +922,11 @@ // why the call to HedgehogStep then a further increment of X? if (prevX = hwRound(HHGear^.X)) and CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y), - LAND_INDESTRUCTIBLE) then HedgehogStep(HHGear); + lfIndestructible) then HedgehogStep(HHGear); if (prevX = hwRound(HHGear^.X)) and CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y), - LAND_INDESTRUCTIBLE) then HHGear^.X := HHGear^.X + SignAs(_1, HHGear^.dX); + lfIndestructible) then HHGear^.X := HHGear^.X + SignAs(_1, HHGear^.dX); HHGear^.State := HHGear^.State or gstAttacking end; @@ -936,7 +936,7 @@ BTSteps := 0; if CheckLandValue(hwRound(HHGear^.X + Gear^.dX * (cHHRadius + cBlowTorchC) + SignAs(_6, Gear^.dX)), hwRound(HHGear^.Y + Gear^.dY * (cHHRadius + cBlowTorchC)), - LAND_INDESTRUCTIBLE) then + lfIndestructible) then begin Gear^.X := HHGear^.X + Gear^.dX * (cHHRadius + cBlowTorchC); Gear^.Y := HHGear^.Y + Gear^.dY * (cHHRadius + cBlowTorchC); @@ -1795,7 +1795,7 @@ end; if CheckLandValue(hwRound(HHGear^.X), hwRound(HHGear^.Y + HHGear^.dY + SignAs(_6,Gear^.dY)), - LAND_INDESTRUCTIBLE) then + lfIndestructible) then HHGear^.Y := HHGear^.Y + HHGear^.dY end; @@ -2545,7 +2545,7 @@ or (not TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) and not TestCollisionXWithGear(Gear, hwSign(Gear^.dX))) // CheckLandValue returns true if the type isn't matched - or not CheckLandValue(hwRound(Gear^.Y), hwRound(Gear^.X), LAND_INDESTRUCTIBLE) then + or not CheckLandValue(hwRound(Gear^.Y), hwRound(Gear^.X), lfIndestructible) then begin //out of time or exited ground StopSound(Gear^.SoundChannel);