diff options
author | Darkvater <darkvater@openttd.org> | 2006-01-29 18:57:26 +0000 |
---|---|---|
committer | Darkvater <darkvater@openttd.org> | 2006-01-29 18:57:26 +0000 |
commit | 4e09974975ba47b755ac00b58aae880fa297e161 (patch) | |
tree | a71e925a12583a807b9e921fd125c8ae1b8e8721 /roadveh_cmd.c | |
parent | bb49381cd3ce8c95e459d1f542fc15064d7b17ea (diff) | |
download | openttd-4e09974975ba47b755ac00b58aae880fa297e161.tar.xz |
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
- The only change is that the nsignalsw.grf file is kept and that existing nightlies with PBS signals get those signals converted to combo-signals.
Diffstat (limited to 'roadveh_cmd.c')
-rw-r--r-- | roadveh_cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roadveh_cmd.c b/roadveh_cmd.c index ac5c40248..0bb9bf321 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -1062,7 +1062,7 @@ static int RoadFindPathToDest(Vehicle *v, TileIndex tile, int enterdir) trackdir = DiagdirToDiagTrackdir(enterdir); //debug("Finding path. Enterdir: %d, Trackdir: %d", enterdir, trackdir); - ftd = NPFRouteToStationOrTile(tile - TileOffsByDir(enterdir), trackdir, &fstd, TRANSPORT_ROAD, v->owner, INVALID_RAILTYPE, PBS_MODE_NONE); + ftd = NPFRouteToStationOrTile(tile - TileOffsByDir(enterdir), trackdir, &fstd, TRANSPORT_ROAD, v->owner, INVALID_RAILTYPE); if (ftd.best_trackdir == 0xff) { /* We are already at our target. Just do something */ //TODO: maybe display error? @@ -1140,7 +1140,7 @@ static uint RoadFindPathToStation(const Vehicle *v, TileIndex tile) fstd.dest_coords = tile; fstd.station_index = -1; // indicates that the destination is a tile, not a station - return NPFRouteToStationOrTile(v->tile, trackdir, &fstd, TRANSPORT_ROAD, v->owner, INVALID_RAILTYPE, PBS_MODE_NONE).best_path_dist; + return NPFRouteToStationOrTile(v->tile, trackdir, &fstd, TRANSPORT_ROAD, v->owner, INVALID_RAILTYPE).best_path_dist; } #endif |