mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r3785) Replace some if-magic to determine the turning direction for road vehicles with the new DirDiff stuff

release/0.5
tron 2006-03-08 07:50:26 +00:00
parent ecabf8a5f0
commit 8b447de24c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roadveh_cmd.c
View File

@ -852,15 +852,11 @@ static Direction RoadVehGetSlidingDirection(const Vehicle* v, int x, int y)
{ {
Direction b = RoadVehGetNewDirection(v, x, y); Direction b = RoadVehGetNewDirection(v, x, y);
Direction d = v->direction; Direction d = v->direction;
DirDiff delta;
if (b == d) return d; if (b == d) return d;
d = (d + 1) & 7; delta = (DirDifference(d, b) > DIRDIFF_REVERSE ? DIRDIFF_45LEFT : DIRDIFF_45RIGHT);
if (b == d) return d; return ChangeDir(d, delta);
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;
} }
typedef struct OvertakeData { typedef struct OvertakeData {