summaryrefslogtreecommitdiff
path: root/src/order.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-09-28 21:15:45 +0000
committerrubidium <rubidium@openttd.org>2007-09-28 21:15:45 +0000
commitbeeae81f605bed24081d7d389ad85961e479b461 (patch)
tree9c123ba4ba288529f497d5f3152afe0cb9f7232e /src/order.h
parente67b985bfac22680f1916280ce6e7dda82620c47 (diff)
downloadopenttd-beeae81f605bed24081d7d389ad85961e479b461.tar.xz
(svn r11184) -Codechange: cleanup the code related to backup orders.
Diffstat (limited to 'src/order.h')
-rw-r--r--src/order.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/order.h b/src/order.h
index a9ccf383e..2887972ec 100644
--- a/src/order.h
+++ b/src/order.h
@@ -116,18 +116,18 @@ struct Order : PoolItem<Order, OrderID, &_Order_pool> {
void FreeChain();
};
-#define MAX_BACKUP_ORDER_COUNT 40
-
struct BackuppedOrders {
+ BackuppedOrders() : order(NULL) { }
+
VehicleID clone;
VehicleOrderID orderindex;
- Order order[MAX_BACKUP_ORDER_COUNT + 1];
+ Order *order;
uint16 service_interval;
char name[32];
};
VARDEF TileIndex _backup_orders_tile;
-VARDEF BackuppedOrders _backup_orders_data[1];
+VARDEF BackuppedOrders _backup_orders_data;
static inline VehicleOrderID GetMaxOrderIndex()
{
@@ -200,8 +200,8 @@ static inline Order UnpackOrder(uint32 packed)
}
/* Functions */
-void BackupVehicleOrders(const Vehicle *v, BackuppedOrders *order);
-void RestoreVehicleOrders(const Vehicle* v, const BackuppedOrders* order);
+void BackupVehicleOrders(const Vehicle *v, BackuppedOrders *order = &_backup_orders_data);
+void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *order = &_backup_orders_data);
void RemoveOrderFromAllVehicles(OrderType type, DestinationID destination);
void InvalidateVehicleOrder(const Vehicle *v);
bool VehicleHasDepotOrders(const Vehicle *v);