Mercurial > hg > openttd

diff src/roadveh_cmd.cpp @ 9224:c8a0fa0e208a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r13090) -Codechange: add functions for direct conversion from DiagDirection to Track and Trackbits
author smatz <smatz@openttd.org>
date Wed, 14 May 2008 18:31:21 +0000 (2008-05-14)
parents d48433370037
children 02827bf3dc03
line wrap: on
line diff
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -970,7 +970,7 @@
 	/* 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 @@
 			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 @@
 		}
 
 		if (diag_dir == INVALID_DIAGDIR) return INVALID_TRACKDIR;
-		dir = DiagdirToDiagTrackdir(diag_dir);
+		dir = DiagDirToDiagTrackdir(diag_dir);
 	} else {
 		if (already_reversed && prev->tile != tile) {
 			/*