diff options
| author | smatz <smatz@openttd.org> | 2008-05-14 18:31:21 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-05-14 18:31:21 +0000 |
| commit | ec627dedf884069a1cbca8ebf524d761e755493c (patch) | |
| tree | 865f25008dfeacaa3e7b65aadc36c6076eb1c4b0 /src/roadveh_cmd.cpp | |
| parent | 56f15b3544089c3d690644b0b4f6e88c65710d83 (diff) | |
| download | openttd-ec627dedf884069a1cbca8ebf524d761e755493c.tar.xz | |
(svn r13090) -Codechange: add functions for direct conversion from DiagDirection to Track and Trackbits
Diffstat (limited to 'src/roadveh_cmd.cpp')
| -rw-r--r-- | src/roadveh_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index f5b52a6fc..cf6d011db 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -970,7 +970,7 @@ static void RoadVehCheckOvertake(Vehicle *v, Vehicle *u) /* Check if vehicle is in a road stop, depot, tunnel or bridge or not on a straight road */ if (v->u.road.state >= RVSB_IN_ROAD_STOP || !IsStraightRoadTrackdir((Trackdir)(v->u.road.state & RVSB_TRACKDIR_MASK))) return; - od.trackdir = DiagdirToDiagTrackdir(DirToDiagDir(v->direction)); + od.trackdir = DiagDirToDiagTrackdir(DirToDiagDir(v->direction)); /* Are the current and the next tile suitable for overtaking? * - Does the track continue along od.trackdir @@ -1135,7 +1135,7 @@ static Trackdir RoadFindPathToDest(Vehicle* v, TileIndex tile, DiagDirection ent NPFFindStationOrTileData fstd; NPFFillWithOrderData(&fstd, v); - Trackdir trackdir = DiagdirToDiagTrackdir(enterdir); + Trackdir trackdir = DiagDirToDiagTrackdir(enterdir); //debug("Finding path. Enterdir: %d, Trackdir: %d", enterdir, trackdir); NPFFoundTargetData ftd = PerfNPFRouteToStationOrTile(tile - TileOffsByDiagDir(enterdir), trackdir, true, &fstd, TRANSPORT_ROAD, v->u.road.compatible_roadtypes, v->owner, INVALID_RAILTYPES); @@ -1325,7 +1325,7 @@ static Trackdir FollowPreviousRoadVehicle(const Vehicle *v, const Vehicle *prev, } if (diag_dir == INVALID_DIAGDIR) return INVALID_TRACKDIR; - dir = DiagdirToDiagTrackdir(diag_dir); + dir = DiagDirToDiagTrackdir(diag_dir); } else { if (already_reversed && prev->tile != tile) { /* |