From b00bfa0adf306ddb8811b150176c6867f37588c3 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 19 Nov 2008 14:48:12 +0000 Subject: (svn r14594) -Fix [FS#2412]: trains could get their their last visited station reset when still (un)loading causing an invalid state. --- src/train_cmd.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/train_cmd.cpp') diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index c78d1ef54..c70a9b096 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2814,10 +2814,16 @@ private: Vehicle *v; Order old_order; TileIndex old_dest_tile; + StationID old_last_station_visited; VehicleOrderID index; public: - VehicleOrderSaver(Vehicle *_v) : v(_v), old_order(_v->current_order), old_dest_tile(_v->dest_tile), index(_v->cur_order_index) + VehicleOrderSaver(Vehicle *_v) : + v(_v), + old_order(_v->current_order), + old_dest_tile(_v->dest_tile), + old_last_station_visited(_v->last_station_visited), + index(_v->cur_order_index) { } @@ -2825,6 +2831,7 @@ public: { this->v->current_order = this->old_order; this->v->dest_tile = this->old_dest_tile; + this->v->last_station_visited = this->old_last_station_visited; } /** -- cgit v1.2.3-70-g09d2