From 5eafcd8de69bad1d80609e84828c3de2bce38d24 Mon Sep 17 00:00:00 2001 From: frosch Date: Fri, 15 Apr 2011 19:03:55 +0000 Subject: (svn r22324) -Fix: Vehicles skipped orders when inserting automatic orders failed. --- src/vehicle.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index e3ffbbc91..f4f38bd9c 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1919,6 +1919,13 @@ void Vehicle::HandleLoading(bool mode) this->LeaveStation(); + /* Only advance to next order if we just loaded at the current one */ + const Order *order = this->GetOrder(this->cur_auto_order_index); + if (order == NULL || + (!order->IsType(OT_AUTOMATIC) && !order->IsType(OT_GOTO_STATION)) || + order->GetDestination() != this->last_station_visited) { + return; + } break; } -- cgit v1.2.3-54-g00ecf