Mercurial > hg > openttd
changeset 4392:c94e96e24010 draft
(svn r6145) -Codechange: added OrderID to indicate Order indexes out of the pool
author | truelight <truelight@openttd.org> |
---|---|
date | Sat, 26 Aug 2006 17:16:51 +0000 |
parents | 4daf41d96969 |
children | c5b617a2f893 |
files | openttd.h order.h order_cmd.c |
diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/openttd.h +++ b/openttd.h @@ -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;
--- a/order.h +++ b/order.h @@ -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); }
--- a/order_cmd.c +++ b/order_cmd.c @@ -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;