summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/station_cmd.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index cabadaa2a..15fca6f33 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -1532,6 +1532,18 @@ static CommandCost RemoveRoadStop(Station *st, uint32 flags, TileIndex tile)
InvalidateWindowWidget(WC_STATION_VIEW, st->index, SVW_ROADVEHS);
delete cur_stop;
+
+ /* Make sure no vehicle is going to the old roadstop */
+ Vehicle *v;
+ FOR_ALL_VEHICLES(v) {
+ if (v->type == VEH_ROAD &&
+ v->First() == v &&
+ v->current_order.IsType(OT_GOTO_STATION) &&
+ v->dest_tile == tile) {
+ v->dest_tile = v->GetOrderStationLocation(st->index);
+ }
+ }
+
DoClearSquare(tile);
st->rect.AfterRemoveTile(st, tile);