Mercurial > hg > openttd
changeset 9624:6db124593633 draft
(svn r13680) -Fix: NPF crashing when a ship tried to find a nearby depot when on an aqueduct.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 07 Jul 2008 16:04:38 +0000 |
| parents | ed991defc90f |
| children | b55686de084c |
| files | src/vehicle.cpp |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1650,7 +1650,7 @@ if (v->u.rail.track == TRACK_BIT_DEPOT) // We'll assume the train is facing outwards return DiagDirToDiagTrackdir(GetRailDepotDirection(v->tile)); // Train in depot - if (v->u.rail.track == TRACK_BIT_WORMHOLE) // train in tunnel, so just use his direction and assume a diagonal track + if (v->u.rail.track == TRACK_BIT_WORMHOLE) // train in tunnel or on bridge, so just use his direction and assume a diagonal track return DiagDirToDiagTrackdir(DirToDiagDir(v->direction)); return TrackDirectionToTrackdir(FindFirstTrack(v->u.rail.track), v->direction); @@ -1660,6 +1660,9 @@ // We'll assume the ship is facing outwards return DiagDirToDiagTrackdir(GetShipDepotDirection(v->tile)); + if (v->u.ship.state == TRACK_BIT_WORMHOLE) // ship on aqueduct, so just use his direction and assume a diagonal track + return DiagDirToDiagTrackdir(DirToDiagDir(v->direction)); + return TrackDirectionToTrackdir(FindFirstTrack(v->u.ship.state), v->direction); case VEH_ROAD: