dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ship_collision_avoidance' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-01-28 20:58:18 +00:00
parent ab6119cb76 e4a10e9313
commit 902fd73c47
3 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pathfinder/opf/opf_ship.cpp
View File

@@ -121,7 +121,7 @@ static void OPFShipFollowTrack(TileIndex tile, DiagDirection direction, TrackPat
}
/** Directions to search towards given track bits and the ship's enter direction. */
static const DiagDirection _ship_search_directions[6][4] = {
extern const DiagDirection _ship_search_directions[6][4] = {
{ DIAGDIR_NE, INVALID_DIAGDIR, DIAGDIR_SW, INVALID_DIAGDIR },
{ INVALID_DIAGDIR, DIAGDIR_SE, INVALID_DIAGDIR, DIAGDIR_NW },
{ INVALID_DIAGDIR, DIAGDIR_NE, DIAGDIR_NW, INVALID_DIAGDIR },