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

Fix crash when road vehicle changed length in drive-through road stop

Browse Source 
Due to refit and incorrectly implemented NewGRF
This commit is contained in:
Jonathan G Rennison
2024-02-09 18:21:51 +00:00
parent cfebbfac8c
commit 130d9cb650
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/roadstop_base.h
View File

@@ -60,6 +60,14 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
return this->occupied; return this->occupied;
} }
/**
* Adjust the occupation of this road stop, only to handle vehicles unexpectedly changing length
*/
inline void AdjustOccupation(int adjustment)
{
this->occupied += adjustment;
}
void Leave(const RoadVehicle *rv); void Leave(const RoadVehicle *rv);
void Enter(const RoadVehicle *rv); void Enter(const RoadVehicle *rv);
void CheckIntegrity(const RoadStop *rs) const; void CheckIntegrity(const RoadStop *rs) const;

8
src/roadveh_cmd.cpp
View File

@@ -222,6 +222,7 @@ void RoadVehUpdateCache(RoadVehicle *v, bool same_length)
v->InvalidateNewGRFCacheOfChain(); v->InvalidateNewGRFCacheOfChain();
const uint16_t old_total_length = v->gcache.cached_total_length;
v->gcache.cached_total_length = 0; v->gcache.cached_total_length = 0;
Vehicle *last_vis_effect = v; Vehicle *last_vis_effect = v;
@@ -257,6 +258,13 @@ void RoadVehUpdateCache(RoadVehicle *v, bool same_length)
uint max_speed = GetVehicleProperty(v, PROP_ROADVEH_SPEED, 0); uint max_speed = GetVehicleProperty(v, PROP_ROADVEH_SPEED, 0);
v->vcache.cached_max_speed = (max_speed != 0) ? max_speed * 4 : RoadVehInfo(v->engine_type)->max_speed; v->vcache.cached_max_speed = (max_speed != 0) ? max_speed * 4 : RoadVehInfo(v->engine_type)->max_speed;
if (same_length && old_total_length != v->gcache.cached_total_length) {
if (IsInsideMM(v->state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END)) {
RoadStop *rs = RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile));
rs->GetEntry(v)->AdjustOccupation((int)v->gcache.cached_total_length - (int)old_total_length);
}
}
} }
/** /**