mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r12988) -Fix [FS#1992](r12913): [autoreplace] failing to replace a road vehicle could free it's slot without the vehicle knowing it (leading to assert)

This commit is contained in:
bjarni 2008-05-07 13:11:33 +00:00
parent 3d5567ccf7
commit 0cfd2baa3c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vehicle.cpp
View File

@ -2746,6 +2746,10 @@ Vehicle* BackuppedVehicle::RestoreBackupVehicle(Vehicle *v, Player *p)
assert(v->owner == p->index);
/* Cache the result of the vehicle type check since it will not change
* and we need this check once for every run though the loop. */
bool is_road_veh = v->type == VEH_ROAD;
while (true) {
Vehicle *dest = GetVehicle(backup->index);
/* The vehicle should be free since we are restoring something we just sold. */
@ -2761,6 +2765,12 @@ Vehicle* BackuppedVehicle::RestoreBackupVehicle(Vehicle *v, Player *p)
dest->left_coord = INVALID_COORD;
UpdateVehiclePosHash(dest, INVALID_COORD, 0);
if (is_road_veh) {
/* Removed the slot in the road vehicles as the slot is gone.
* We don't want a pointer to a slot that's gone. */
dest->u.road.slot = NULL;
}
if (!dest->cargo.Empty()) {
/* The vehicle in question contains some cargo.
* However we lost the list so we will have to recreate it.