Mercurial > hg > openttd
changeset 8767:c0458cd19987 draft
(svn r12466) -Codechange: move DestinationID to a more logical location.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Fri, 28 Mar 2008 16:31:26 +0000 |
parents | ab1f94f2961f |
children | 27a5e249703b |
files | src/openttd.h src/order.h src/order_cmd.cpp |
diffstat | 3 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/openttd.h +++ b/src/openttd.h @@ -32,14 +32,6 @@ typedef uint16 SignID; typedef uint16 GroupID; typedef uint16 EngineRenewID; -typedef uint16 DestinationID; - -/* DestinationID must be at least as large as every these below, because it can - * be any of them - */ -assert_compile(sizeof(DestinationID) >= sizeof(DepotID)); -assert_compile(sizeof(DestinationID) >= sizeof(WaypointID)); -assert_compile(sizeof(DestinationID) >= sizeof(StationID)); enum GameModes { GM_MENU,
--- a/src/order.h +++ b/src/order.h @@ -12,6 +12,8 @@ #include "tile_type.h" #include "date_type.h" +typedef uint16 DestinationID; + enum { INVALID_VEH_ORDER_ID = 0xFF, };
--- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -25,6 +25,13 @@ #include "table/strings.h" +/* DestinationID must be at least as large as every these below, because it can + * be any of them + */ +assert_compile(sizeof(DestinationID) >= sizeof(DepotID)); +assert_compile(sizeof(DestinationID) >= sizeof(WaypointID)); +assert_compile(sizeof(DestinationID) >= sizeof(StationID)); + TileIndex _backup_orders_tile; BackuppedOrders _backup_orders_data;