gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r4331) Replace some direction calculation magic with DiagDirection to make a bit more clear what's going on

Browse Source
This commit is contained in:
tron 2006-04-09 08:25:43 +00:00
parent 63e040966e
commit fade7a5997
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
station_cmd.c
View File

@ -2143,15 +2143,14 @@ static uint32 VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y)
if (!(_patches.new_nonstop && v->current_order.flags & OF_NON_STOP) &&
v->current_order.type != OT_LEAVESTATION &&
v->last_station_visited != station_id) {
byte dir;
DiagDirection dir = DirToDiagDir(v->direction);
x &= 0xF;
y &= 0xF;
dir = v->direction & 6;
if (dir & 2) intswap(x,y);
if (DiagDirToAxis(dir) != AXIS_X) intswap(x, y);
if (y == 8) {
if (dir != 2 && dir != 4) x = ~x & 0xF;
if (dir != DIAGDIR_SE && dir != DIAGDIR_SW) x = ~x & 0xF;
if (x == 12) return 2 | (station_id << 8); /* enter station */
if (x < 12) {
uint16 spd;