summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2008-05-07 13:11:33 +0000
committerbjarni <bjarni@openttd.org>2008-05-07 13:11:33 +0000
commitc2a54a60bbdc17edc6dbfdf9492ea6cd9ca3ad58 (patch)
treef4a1b28a05b28cb49bc41e6303732558b9682ef9
parentc28ce39e3cefd43ca52e5daf812048a38f23eeb7 (diff)
downloadopenttd-c2a54a60bbdc17edc6dbfdf9492ea6cd9ca3ad58.tar.xz
(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)
-rw-r--r--src/vehicle.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index c624f97b6..73f2bb0d6 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -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.