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 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. |