From e2122dc7f0e02e50ff2e17ae2d3a164671aa0975 Mon Sep 17 00:00:00 2001 From: yexo Date: Wed, 9 Sep 2009 00:03:35 +0000 Subject: (svn r17483) -Fix (r17405): when an aircraft starts flying in circles make it turn in the correct direction first before continuing --- src/aircraft_cmd.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/aircraft_cmd.cpp') diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index cb38121d2..44d0b95c0 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1071,9 +1071,14 @@ static bool AircraftController(Aircraft *v) /* Turn. Do it slowly if in the air. */ Direction newdir = GetDirectionTowards(v, x + amd->x, y + amd->y); if (newdir != v->direction) { - if (amd->flag & AMED_SLOWTURN) { + if (amd->flag & AMED_SLOWTURN && v->number_consecutive_turns < 8) { if (v->load_unload_time_rem == 0 || newdir == v->last_direction) { - v->load_unload_time_rem = 1 << (_settings_game.vehicle.plane_speed - 1); + if (newdir == v->last_direction) { + v->number_consecutive_turns = 0; + } else { + v->number_consecutive_turns++; + } + v->load_unload_time_rem = 2 * _settings_game.vehicle.plane_speed; v->last_direction = v->direction; v->direction = newdir; } @@ -1094,6 +1099,7 @@ static bool AircraftController(Aircraft *v) gp.new_tile = gp.old_tile = v->tile; } } else { + v->number_consecutive_turns = 0; /* Move vehicle. */ gp = GetNewVehiclePos(v); } -- cgit v1.2.3-54-g00ecf