From 8b447de24c0f65dabb9fc9ea710f6f567303f40f Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 8 Mar 2006 07:50:26 +0000 Subject: [PATCH] (svn r3785) Replace some if-magic to determine the turning direction for road vehicles with the new DirDiff stuff --- roadveh_cmd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 64be9610a1..7a97722ce1 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -852,15 +852,11 @@ static Direction RoadVehGetSlidingDirection(const Vehicle* v, int x, int y) { 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 {