diff options
| -rw-r--r-- | source.list | 1 | ||||
| -rw-r--r-- | src/cargopacket.h | 1 | ||||
| -rw-r--r-- | src/economy_func.h | 1 | ||||
| -rw-r--r-- | src/openttd.h | 4 | ||||
| -rw-r--r-- | src/station.h | 46 | ||||
| -rw-r--r-- | src/station_type.h | 58 | ||||
| -rw-r--r-- | src/vehicle_gui.h | 1 | ||||
| -rw-r--r-- | src/waypoint.h | 1 |
8 files changed, 64 insertions, 49 deletions
diff --git a/source.list b/source.list index 34d49fc49..8081cf4d6 100644 --- a/source.list +++ b/source.list @@ -243,6 +243,7 @@ sprite.h spritecache.h station.h station_gui.h +station_type.h stdafx.h string_func.h string_type.h diff --git a/src/cargopacket.h b/src/cargopacket.h index 866b41ad0..4b6397b62 100644 --- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -7,6 +7,7 @@ #include "economy_type.h" #include "tile_type.h" +#include "station_type.h" #include <list> typedef uint32 CargoPacketID; diff --git a/src/economy_func.h b/src/economy_func.h index 0344ac6da..8ce3a5e6f 100644 --- a/src/economy_func.h +++ b/src/economy_func.h @@ -13,6 +13,7 @@ #include "town_type.h" #include "industry_type.h" #include "player_type.h" +#include "station_type.h" struct Player; diff --git a/src/openttd.h b/src/openttd.h index 8530d6dd3..1459f5a61 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -10,7 +10,6 @@ // Forward declarations of structs. struct Waypoint; -struct Station; struct ViewPort; struct DrawPixelInfo; struct Group; @@ -22,9 +21,6 @@ typedef uint16 UnitID; typedef EngineID *EngineList; ///< engine list type placeholder acceptable for C code (see helpers.cpp) /* IDs used in Pools */ -typedef uint16 StationID; -static const StationID INVALID_STATION = 0xFFFF; -typedef uint16 RoadStopID; typedef uint16 WaypointID; typedef uint16 OrderID; typedef uint16 SignID; diff --git a/src/station.h b/src/station.h index b8557378b..2458e6e56 100644 --- a/src/station.h +++ b/src/station.h @@ -5,6 +5,7 @@ #ifndef STATION_H #define STATION_H +#include "station_type.h" #include "airport.h" #include "oldpool.h" #include "sprite.h" @@ -17,9 +18,6 @@ #include <list> #include <set> -struct Station; -struct RoadStop; - DECLARE_OLD_POOL(Station, Station, 6, 1000) DECLARE_OLD_POOL(RoadStop, RoadStop, 5, 2000) @@ -202,48 +200,6 @@ public: inline bool IsValid() const { return this->xy != 0; } }; -enum StationType { - STATION_RAIL, - STATION_AIRPORT, - STATION_TRUCK, - STATION_BUS, - STATION_OILRIG, - STATION_DOCK, - STATION_BUOY -}; - -enum { - FACIL_TRAIN = 0x01, - FACIL_TRUCK_STOP = 0x02, - FACIL_BUS_STOP = 0x04, - FACIL_AIRPORT = 0x08, - FACIL_DOCK = 0x10, -}; - -enum { -// HVOT_PENDING_DELETE = 1 << 0, // not needed anymore - HVOT_TRAIN = 1 << 1, - HVOT_BUS = 1 << 2, - HVOT_TRUCK = 1 << 3, - HVOT_AIRCRAFT = 1 << 4, - HVOT_SHIP = 1 << 5, - /* This bit is used to mark stations. No, it does not belong here, but what - * can we do? ;-) */ - HVOT_BUOY = 1 << 6 -}; - -enum CatchmentArea { - CA_NONE = 0, - CA_BUS = 3, - CA_TRUCK = 3, - CA_TRAIN = 4, - CA_DOCK = 5, - - CA_UNMODIFIED = 4, ///< Used when _patches.modified_catchment is false - - MAX_CATCHMENT = 10, ///< Airports have a catchment up to this number. -}; - void ModifyStationRatingAround(TileIndex tile, PlayerID owner, int amount, uint radius); /** A set of stations (\c const \c Station* ) */ diff --git a/src/station_type.h b/src/station_type.h new file mode 100644 index 000000000..17ed0ff46 --- /dev/null +++ b/src/station_type.h @@ -0,0 +1,58 @@ +/* $Id$ */ + +/** @file station_type.h Types related to stations. */ + +#ifndef STATION_TYPE_H +#define STATION_TYPE_H + +typedef uint16 StationID; +typedef uint16 RoadStopID; + +struct Station; +struct RoadStop; + +static const StationID INVALID_STATION = 0xFFFF; + +enum StationType { + STATION_RAIL, + STATION_AIRPORT, + STATION_TRUCK, + STATION_BUS, + STATION_OILRIG, + STATION_DOCK, + STATION_BUOY +}; + +enum { + FACIL_TRAIN = 0x01, + FACIL_TRUCK_STOP = 0x02, + FACIL_BUS_STOP = 0x04, + FACIL_AIRPORT = 0x08, + FACIL_DOCK = 0x10, +}; + +enum { +// HVOT_PENDING_DELETE = 1 << 0, // not needed anymore + HVOT_TRAIN = 1 << 1, + HVOT_BUS = 1 << 2, + HVOT_TRUCK = 1 << 3, + HVOT_AIRCRAFT = 1 << 4, + HVOT_SHIP = 1 << 5, + /* This bit is used to mark stations. No, it does not belong here, but what + * can we do? ;-) */ + HVOT_BUOY = 1 << 6 +}; + +enum CatchmentArea { + CA_NONE = 0, + CA_BUS = 3, + CA_TRUCK = 3, + CA_TRAIN = 4, + CA_DOCK = 5, + + CA_UNMODIFIED = 4, ///< Used when _patches.modified_catchment is false + + MAX_CATCHMENT = 10, ///< Airports have a catchment up to this number. +}; + +#endif /* STATION_TYPE_H */ diff --git a/src/vehicle_gui.h b/src/vehicle_gui.h index 7c79aff58..3c27c9e09 100644 --- a/src/vehicle_gui.h +++ b/src/vehicle_gui.h @@ -7,6 +7,7 @@ #include "window_gui.h" #include "vehicle_type.h" +#include "station_type.h" void DrawVehicleProfitButton(const Vehicle *v, int x, int y); void ShowVehicleRefitWindow(const Vehicle *v, VehicleOrderID order); diff --git a/src/waypoint.h b/src/waypoint.h index c995dca0d..97e1c1ff7 100644 --- a/src/waypoint.h +++ b/src/waypoint.h @@ -8,6 +8,7 @@ #include "oldpool.h" #include "rail_map.h" #include "command_type.h" +#include "station_type.h" struct Waypoint; DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000) |