gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 02:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change: Increase maximum number of orders from 64000 to ~16.7m. (#7220)

Browse Source
This commit is contained in:
PeterN 2019-02-18 07:37:25 +00:00 committed by GitHub
parent ef7e47a53a
commit 84961034e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/order_base.h
View File

@ -21,7 +21,7 @@
#include "vehicle_type.h" #include "vehicle_type.h"
#include "date_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; typedef Pool<OrderList, OrderListID, 128, 64000> OrderListPool;
extern OrderPool _order_pool; extern OrderPool _order_pool;
extern OrderListPool _orderlist_pool; extern OrderListPool _orderlist_pool;

4
src/order_type.h
View File

@ -15,7 +15,7 @@
#include "core/enum_type.hpp" #include "core/enum_type.hpp"
typedef byte VehicleOrderID; ///< The index of an order within its current vehicle (not pool related) 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 OrderListID;
typedef uint16 DestinationID; 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; static const VehicleOrderID MAX_VEH_ORDER_ID = INVALID_VEH_ORDER_ID - 1;
/** Invalid order (sentinel) */ /** 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 * Maximum number of orders in implicit-only lists before we start searching