From 8f090ec4a86171b3987b78900a8ea0457c7c092c Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 11 Oct 2009 12:35:16 +0000 Subject: (svn r17762) -Fix [FS#3259]: don't let aircraft drive a while over the grass when landing at high altitude airports --- src/aircraft_cmd.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index c5a596da3..6ad01d4c6 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1133,19 +1133,21 @@ static bool AircraftController(Aircraft *v) continue; } - uint curz = GetSlopeZ(x, y) + 1; + uint curz = GetSlopeZ(x + amd->x, y + amd->y) + 1; - if (curz > z) { - z++; - } else { - int t = max(1U, dist - 4); + /* We're not flying below our destination, right? */ + assert(curz <= z); + int t = max(1U, dist - 4); + int delta = z - curz; + /* Only start lowering when we're sufficiently close for a 1:1 glide */ + if (delta >= t) { z -= ((z - curz) + t - 1) / t; - if (z < curz) z = curz; } + if (z < curz) z = curz; } - /* We've landed. Decrase speed when we're reaching end of runway. */ + /* We've landed. Decrease speed when we're reaching end of runway. */ if (amd->flag & AMED_BRAKE) { uint curz = GetSlopeZ(x, y) + 1; -- cgit v1.2.3-70-g09d2