|
|
|
@ -1154,7 +1154,7 @@ Trackdir NPFRoadVehicleChooseTrack(const RoadVehicle *v, TileIndex tile, DiagDir
|
|
|
|
|
|
|
|
|
|
/*** Ships ***/
|
|
|
|
|
|
|
|
|
|
Track NPFShipChooseTrack(const Ship *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found)
|
|
|
|
|
Track NPFShipChooseTrack(const Ship *v, TrackBits tracks, bool &path_found)
|
|
|
|
|
{
|
|
|
|
|
NPFFindStationOrTileData fstd;
|
|
|
|
|
Trackdir trackdir = v->GetVehicleTrackdir();
|
|
|
|
@ -1163,7 +1163,7 @@ Track NPFShipChooseTrack(const Ship *v, TileIndex tile, DiagDirection enterdir,
|
|
|
|
|
NPFFillWithOrderData(&fstd, v);
|
|
|
|
|
|
|
|
|
|
AyStarUserData user = { v->owner, TRANSPORT_WATER, INVALID_RAILTYPES, ROADTYPES_NONE };
|
|
|
|
|
NPFFoundTargetData ftd = NPFRouteToStationOrTile(tile - TileOffsByDiagDir(enterdir), trackdir, true, &fstd, &user);
|
|
|
|
|
NPFFoundTargetData ftd = NPFRouteToStationOrTile(v->tile, trackdir, true, &fstd, &user);
|
|
|
|
|
|
|
|
|
|
/* If ftd.best_bird_dist is 0, we found our target and ftd.best_trackdir contains
|
|
|
|
|
* the direction we need to take to get there, if ftd.best_bird_dist is not 0,
|
|
|
|
@ -1256,7 +1256,7 @@ bool NPFTrainCheckReverse(const Train *v)
|
|
|
|
|
return ftd.best_bird_dist == 0 && NPFGetFlag(&ftd.node, NPF_FLAG_REVERSE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Track NPFTrainChooseTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, struct PBSTileInfo *target)
|
|
|
|
|
Track NPFTrainChooseTrack(const Train *v, TrackBits tracks, bool &path_found, bool reserve_track, struct PBSTileInfo *target)
|
|
|
|
|
{
|
|
|
|
|
NPFFindStationOrTileData fstd;
|
|
|
|
|
NPFFillWithOrderData(&fstd, v, reserve_track);
|
|
|
|
|