Mercurial > hg > openttd
changeset 9495:9fd9426b36c9 draft
(svn r13475) -Fix (r13464): crash on destroying aquaduct with ship on in and on company bankrupt
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Wed, 11 Jun 2008 15:56:55 +0000 |
| parents | 3503f9917e4a |
| children | 26305433ddc6 |
| files | src/tunnelbridge_cmd.cpp src/vehicle.cpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -1268,9 +1268,9 @@ if (CmdFailed(DoCommand(tile, 0, 0, DC_EXEC | DC_BANKRUPT, CMD_LANDSCAPE_CLEAR))) { /* When clearing the bridge/tunnel failed there are still vehicles on/in * the bridge/tunnel. As all *our* vehicles are already removed, they - * must be of another owner. Therefor this must be a road bridge/tunnel. + * must be of another owner. Therefore this can't be rail tunnel/bridge. * In that case we can safely reassign the ownership to OWNER_NONE. */ - assert(GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD); + assert(GetTunnelBridgeTransportType(tile) != TRANSPORT_RAIL); SetTileOwner(tile, OWNER_NONE); } }
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -206,7 +206,7 @@ /** Procedure called for every vehicle found in tunnel/bridge in the hash map */ static void *GetVehicleTunnelBridgeProc(Vehicle *v, void *data) { - if (v->type != VEH_TRAIN && v->type != VEH_ROAD) return NULL; + if (v->type != VEH_TRAIN && v->type != VEH_ROAD && v->type != VEH_SHIP) return NULL; _error_message = VehicleInTheWayErrMsg(v); return v;