summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--roadveh_cmd.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/roadveh_cmd.c b/roadveh_cmd.c
index 64be9610a..7a97722ce 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 {