(svn r12466) -Codechange: move DestinationID to a more logical location.
--- a/src/openttd.h Fri Mar 28 11:09:14 2008 +0000
+++ b/src/openttd.h Fri Mar 28 16:31:26 2008 +0000
@@ -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 Fri Mar 28 11:09:14 2008 +0000
+++ b/src/order.h Fri Mar 28 16:31:26 2008 +0000
@@ -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 Fri Mar 28 11:09:14 2008 +0000
+++ b/src/order_cmd.cpp Fri Mar 28 16:31:26 2008 +0000
@@ -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;