# HG changeset patch # User truelight # Date 1156612611 0 # Node ID 6e2600cb89727e87147fa651047492bbe12e6299 # Parent 7bfd170bfdf51a9452fc41acb6368048ef78ab10 (svn r6145) -Codechange: added OrderID to indicate Order indexes out of the pool diff -r 7bfd170bfdf5 -r 6e2600cb8972 openttd.h --- a/openttd.h Sat Aug 26 17:12:24 2006 +0000 +++ b/openttd.h Sat Aug 26 17:16:51 2006 +0000 @@ -41,6 +41,7 @@ typedef uint16 IndustryID; typedef uint16 DepotID; typedef uint16 WaypointID; +typedef uint16 OrderID; typedef byte PlayerID; typedef byte VehicleOrderID; ///< The index of an order within its current vehicle (not pool related) typedef byte CargoID; diff -r 7bfd170bfdf5 -r 6e2600cb8972 order.h --- a/order.h Sat Aug 26 17:12:24 2006 +0000 +++ b/order.h Sat Aug 26 17:16:51 2006 +0000 @@ -82,7 +82,7 @@ struct Order *next; ///< Pointer to next order. If NULL, end of list - uint16 index; ///< Index of the order, is not saved or anything, just for reference + OrderID index; ///< Index of the order, is not saved or anything, just for reference } Order; #define MAX_BACKUP_ORDER_COUNT 40 @@ -103,7 +103,7 @@ /** * Get the pointer to the order with index 'index' */ -static inline Order *GetOrder(uint index) +static inline Order *GetOrder(OrderID index) { return (Order*)GetItemFromPool(&_order_pool, index); } diff -r 7bfd170bfdf5 -r 6e2600cb8972 order_cmd.c --- a/order_cmd.c Sat Aug 26 17:12:24 2006 +0000 +++ b/order_cmd.c Sat Aug 26 17:16:51 2006 +0000 @@ -118,7 +118,7 @@ * TODO - This is just a temporary stage, this will be removed. */ for (order = GetOrder(0); order != NULL; order = (order->index + 1 < GetOrderPoolSize()) ? GetOrder(order->index + 1) : NULL) { if (!IsValidOrder(order)) { - uint index = order->index; + OrderID index = order->index; memset(order, 0, sizeof(*order)); order->index = index;