mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12466) -Codechange: move DestinationID to a more logical location.

release/0.7
rubidium 2008-03-28 16:31:26 +00:00
parent cb96caa3d2
commit 450d234745
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openttd.h
View File

@ -32,14 +32,6 @@ typedef uint16 OrderID;
typedef uint16 SignID; typedef uint16 SignID;
typedef uint16 GroupID; typedef uint16 GroupID;
typedef uint16 EngineRenewID; 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 { enum GameModes {
GM_MENU, GM_MENU,

2
src/order.h
View File

@ -12,6 +12,8 @@
#include "tile_type.h" #include "tile_type.h"
#include "date_type.h" #include "date_type.h"
typedef uint16 DestinationID;
enum { enum {
INVALID_VEH_ORDER_ID = 0xFF, INVALID_VEH_ORDER_ID = 0xFF,
}; };

7
src/order_cmd.cpp
View File

@ -25,6 +25,13 @@
#include "table/strings.h" #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; TileIndex _backup_orders_tile;
BackuppedOrders _backup_orders_data; BackuppedOrders _backup_orders_data;