Mercurial > hg > openttd
changeset 5746:0d0228d0cc60 draft
(svn r8294) -Fix: deleting a vehicle with shared orders, but no orders would fail to reset prev_shared and next_shared
-As a result, vehicles in the game could end up having prev/next pointers to vehicles, that was no longer in the game
| author | bjarni <bjarni@openttd.org> |
|---|---|
| date | Sun, 21 Jan 2007 00:13:39 +0000 |
| parents | 9c34cdf6cc19 |
| children | 61edd889181d |
| files | src/vehicle.cpp src/vehicle.h |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -572,7 +572,7 @@ UpdateVehiclePosHash(v, INVALID_COORD, 0); v->next_hash = NULL; - if (v->orders != NULL) DeleteVehicleOrders(v); + if (IsPlayerBuildableVehicleType(v)) DeleteVehicleOrders(v); /* Now remove any artic part. This will trigger an other * destroy vehicle, which on his turn can remove any
--- a/src/vehicle.h +++ b/src/vehicle.h @@ -407,6 +407,18 @@ v->type = 0; } +static inline bool IsPlayerBuildableVehicleType(const Vehicle *v) +{ + switch (v->type) { + case VEH_Train: + case VEH_Road: + case VEH_Ship: + case VEH_Aircraft: + return true; + } + return false; +} + #define FOR_ALL_VEHICLES_FROM(v, start) for (v = GetVehicle(start); v != NULL; v = (v->index + 1U < GetVehiclePoolSize()) ? GetVehicle(v->index + 1) : NULL) if (IsValidVehicle(v)) #define FOR_ALL_VEHICLES(v) FOR_ALL_VEHICLES_FROM(v, 0)