Merge branch 'auto_timetables' into auto_timetables-sx

2015-11-30 22:31:08 +00:00
parent fe598efde5 d2b87485fb
commit 9eb07b4a77
45 changed files with 586 additions and 354 deletions
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -811,7 +811,7 @@ static byte AircraftGetEntryPoint(const Aircraft *v, const AirportFTAClass *apc,
 		/* We are northwest or southeast of the airport */
 		dir = delta_y < 0 ? DIAGDIR_NW : DIAGDIR_SE;
 	}
-	dir = ChangeDiagDir(dir, (DiagDirDiff)ReverseDiagDir(DirToDiagDir(rotation)));
+	dir = ChangeDiagDir(dir, DiagDirDifference(DIAGDIR_NE, DirToDiagDir(rotation)));
 	return apc->entry_points[dir];
 }