Merge branch 'ship_collision_avoidance' into jgrpp

2018-01-28 20:58:18 +00:00
parent ab6119cb76 e4a10e9313
commit 902fd73c47
3 changed files with 54 additions and 36 deletions
--- a/src/ship.h
+++ b/src/ship.h
@@ -15,6 +15,8 @@
 #include "vehicle_base.h"
 #include "water_map.h"

+extern const DiagDirection _ship_search_directions[TRACK_END][DIAGDIR_END];
+
 void GetShipSpriteSize(EngineID engine, uint &width, uint &height, int &xoffs, int &yoffs, EngineImageType image_type);
 WaterClass GetEffectiveWaterClass(TileIndex tile);