Merge branch 'master' into jgrpp

2019-01-15 18:39:32 +00:00
parent f645222d8f 6b0a467a50
commit 7c539267ed
8 changed files with 1084 additions and 122 deletions
--- a/src/ship.h
+++ b/src/ship.h
@@ -50,6 +50,8 @@ struct Ship FINAL : public SpecializedVehicle<Ship, VEH_SHIP> {
 	void UpdateCache();
 };

+static const uint SHIP_MAX_ORDER_DISTANCE = 130;
+
 /**
 * Iterate over all ships.
 * @param var The variable used for iteration.