From 8b65349d86f0bf71af0ec1a9bf1c08cd9adac2ec Mon Sep 17 00:00:00 2001 From: maedhros Date: Fri, 20 Apr 2007 11:05:56 +0000 Subject: [PATCH] (svn r9684) -Fix (r9683): Remove vehicles from the station loading list instead of adding them again when they leave, and add a v->LeaveStation() call for aircraft. --- src/aircraft_cmd.cpp | 1 + src/vehicle.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 12e5695526..aabe323bd4 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1411,6 +1411,7 @@ static void HandleAircraftLoading(Vehicle *v, int mode) } Order b = v->current_order; + v->LeaveStation(); v->current_order.Free(); MarkAircraftDirty(v); if (!(b.flags & OF_NON_STOP)) return; diff --git a/src/vehicle.cpp b/src/vehicle.cpp index c14d376e10..d851dcb091 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2916,5 +2916,5 @@ void Vehicle::LeaveStation() assert(current_order.type == OT_LOADING); current_order.type = OT_LEAVESTATION; current_order.flags = 0; - GetStation(this->last_station_visited)->loading_vehicles.push_back(this); + GetStation(this->last_station_visited)->loading_vehicles.remove(this); }