cpp/openttd-patchpack/source Changeset - r9624:3d09a2b617a4

Changeset - r9624:3d09a2b617a4

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 16 years ago 2008-07-07 16:04:38
rubidium@openttd.org

(svn r13680) -Fix: NPF crashing when a ship tried to find a nearby depot when on an aqueduct.

1 file changed with 4 insertions and 1 deletions:

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1650,7 +1650,7 @@ Trackdir GetVehicleTrackdir(const Vehicl @@
 			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 @@ Trackdir GetVehicleTrackdir(const Vehicl @@
 				// 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:

0 comments (0 inline, 0 general)