Don't check speed and land for MoreWind check in doFallingGear
authorWuzzy <Wuzzy2@mail.ru>
Thu, 25 Jun 2020 07:15:58 +0200
changeset 15657 e229d0cacd37
parent 15656 21dece8f55fe
child 15658 34c32a11203e
Don't check speed and land for MoreWind check in doFallingGear Disabling More Wind is completely timer-based, so the additional check for collision and speed is no longer neccessary
hedgewars/uGearsHandlersMess.pas
--- a/hedgewars/uGearsHandlersMess.pas	Thu Jun 25 06:44:35 2020 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Thu Jun 25 07:15:58 2020 +0200
@@ -543,9 +543,7 @@
            // while a gear is moving, this can be rather confusing.
            // TODO: Find a way to make gfMoreWind-affected land objects settle more reliably
            // and quickler without touching wind itselvs
-           ((not (Gear^.Kind in [gtMine, gtAirMine, gtSMine, gtKnife, gtExplosives])) or (TimeNotInTurn < MaxMoreWindTime)) and
-           ((xland or land) = 0) and
-           ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) > _0_02.QWordValue) then
+           ((not (Gear^.Kind in [gtMine, gtAirMine, gtSMine, gtKnife, gtExplosives])) or (TimeNotInTurn < MaxMoreWindTime)) then
             Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density
         end;