dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deleting road vehicle in bay stop not unmarking as occupied

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-02-21 22:25:56 +00:00
parent 53b06a3d04
commit 16d77d9268
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/roadveh_cmd.cpp
View File

@@ -536,9 +536,6 @@ static void DeleteLastRoadVeh(RoadVehicle *v)
u->SetNext(nullptr); u->SetNext(nullptr);
v->last_station_visited = first->last_station_visited; // for PreDestructor v->last_station_visited = first->last_station_visited; // for PreDestructor
/* Only leave the road stop when we're really gone. */
if (IsInsideMM(v->state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END)) RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile))->Leave(v);
delete v; delete v;
} }

4
src/vehicle.cpp
View File

@@ -1202,8 +1202,8 @@ void Vehicle::PreDestructor()
if (this->type == VEH_ROAD && this->IsPrimaryVehicle()) { if (this->type == VEH_ROAD && this->IsPrimaryVehicle()) {
RoadVehicle *v = RoadVehicle::From(this); RoadVehicle *v = RoadVehicle::From(this);
if (!(v->vehstatus & VS_CRASHED) && IsInsideMM(v->state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END)) { if (IsInsideMM(v->state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END) || IsInsideMM(v->state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END)) {
/* Leave the drive through roadstop, when you have not already left it. */ /* Leave the roadstop (bay or drive-through), when you have not already left it. */
RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile))->Leave(v); RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile))->Leave(v);
} }