diff options
| -rw-r--r-- | src/vehicle.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 459af8473..9422db456 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -46,6 +46,7 @@ #include "core/pool_func.hpp" #include "economy_base.h" #include "articulated_vehicles.h" +#include "roadstop_base.h" #include "table/sprites.h" #include "table/strings.h" @@ -574,6 +575,15 @@ void Vehicle::PreDestructor() } } + + if (this->type == VEH_ROAD && this->IsPrimaryVehicle()) { + RoadVehicle *v = RoadVehicle::From(this); + if (!(v->vehstatus & VS_CRASHED) && IsInsideMM(v->state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END)) { + /* Leave the drive through roadstop, when you have not already left it. */ + RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile))->Leave(v); + } + } + if (this->Previous() == NULL) { InvalidateWindowData(WC_VEHICLE_DEPOT, this->tile); } |