Merge branch 'save_ext' into jgrpp

Conflicts:
	src/pathfinder/follow_track.hpp
This commit is contained in:
Jonathan G Rennison
2015-10-31 10:53:00 +00:00
20 changed files with 164 additions and 85 deletions

View File

@@ -820,7 +820,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];
}