summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeterN <peter@fuzzle.org>2019-02-18 07:37:25 +0000
committerGitHub <noreply@github.com>2019-02-18 07:37:25 +0000
commit84961034e481859d7266545d4ce0deb6b3ea2911 (patch)
treea12a707b55d81b7746029e56112cfb205b3e0002
parentef7e47a53afbcf8086ef8211f32ac4277c5309b0 (diff)
downloadopenttd-84961034e481859d7266545d4ce0deb6b3ea2911.tar.xz
Change: Increase maximum number of orders from 64000 to ~16.7m. (#7220)
-rw-r--r--src/order_base.h2
-rw-r--r--src/order_type.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/order_base.h b/src/order_base.h
index a67cf69bb..0def7b0bc 100644
--- a/src/order_base.h
+++ b/src/order_base.h
@@ -21,7 +21,7 @@
#include "vehicle_type.h"
#include "date_type.h"
-typedef Pool<Order, OrderID, 256, 64000> OrderPool;
+typedef Pool<Order, OrderID, 256, 0xFF0000> OrderPool;
typedef Pool<OrderList, OrderListID, 128, 64000> OrderListPool;
extern OrderPool _order_pool;
extern OrderListPool _orderlist_pool;
diff --git a/src/order_type.h b/src/order_type.h
index ac66bfa38..b1e0fad53 100644
--- a/src/order_type.h
+++ b/src/order_type.h
@@ -15,7 +15,7 @@
#include "core/enum_type.hpp"
typedef byte VehicleOrderID; ///< The index of an order within its current vehicle (not pool related)
-typedef uint16 OrderID;
+typedef uint32 OrderID;
typedef uint16 OrderListID;
typedef uint16 DestinationID;
@@ -25,7 +25,7 @@ static const VehicleOrderID INVALID_VEH_ORDER_ID = 0xFF;
static const VehicleOrderID MAX_VEH_ORDER_ID = INVALID_VEH_ORDER_ID - 1;
/** Invalid order (sentinel) */
-static const OrderID INVALID_ORDER = 0xFFFF;
+static const OrderID INVALID_ORDER = 0xFFFFFF;
/**
* Maximum number of orders in implicit-only lists before we start searching