--- a/roadveh_cmd.c	Wed Mar 08 07:48:56 2006 +0000
+++ b/roadveh_cmd.c	Wed Mar 08 07:50:26 2006 +0000
@@ -852,15 +852,11 @@
 {
 	Direction b = RoadVehGetNewDirection(v, x, y);
 	Direction d = v->direction;
+	DirDiff delta;
 
 	if (b == d) return d;
-	d = (d + 1) & 7;
-	if (b == d) return d;
-	d = (d - 2) & 7;
-	if (b == d) return d;
-	if (b == ((d - 1) & 7)) return d;
-	if (b == ((d - 2) & 7)) return d;
-	return (d + 2) & 7;
+	delta = (DirDifference(d, b) > DIRDIFF_REVERSE ? DIRDIFF_45LEFT : DIRDIFF_45RIGHT);
+	return ChangeDir(d, delta);
 }
 
 typedef struct OvertakeData {