mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-16 00:12:51 +00:00
(svn r23770) -Fix: compilation with GCC 4.7
This commit is contained in:
parent
182969f531
commit
24bf6ea495
@ -44,11 +44,11 @@ public:
|
|||||||
*/
|
*/
|
||||||
enum StationType {
|
enum StationType {
|
||||||
/* Note: these values represent part of the in-game StationFacility enum */
|
/* Note: these values represent part of the in-game StationFacility enum */
|
||||||
STATION_TRAIN = ::FACIL_TRAIN, ///< Train station
|
STATION_TRAIN = (int)::FACIL_TRAIN, ///< Train station
|
||||||
STATION_TRUCK_STOP = ::FACIL_TRUCK_STOP, ///< Truck station
|
STATION_TRUCK_STOP = (int)::FACIL_TRUCK_STOP, ///< Truck station
|
||||||
STATION_BUS_STOP = ::FACIL_BUS_STOP, ///< Bus station
|
STATION_BUS_STOP = (int)::FACIL_BUS_STOP, ///< Bus station
|
||||||
STATION_AIRPORT = ::FACIL_AIRPORT, ///< Airport
|
STATION_AIRPORT = (int)::FACIL_AIRPORT, ///< Airport
|
||||||
STATION_DOCK = ::FACIL_DOCK, ///< Dock
|
STATION_DOCK = (int)::FACIL_DOCK, ///< Dock
|
||||||
STATION_ANY = STATION_TRAIN | STATION_TRUCK_STOP | STATION_BUS_STOP | STATION_AIRPORT | STATION_DOCK, ///< All station types
|
STATION_ANY = STATION_TRAIN | STATION_TRUCK_STOP | STATION_BUS_STOP | STATION_AIRPORT | STATION_DOCK, ///< All station types
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -41,8 +41,8 @@ public:
|
|||||||
*/
|
*/
|
||||||
enum WaypointType {
|
enum WaypointType {
|
||||||
/* Note: these values represent part of the in-game StationFacility enum */
|
/* Note: these values represent part of the in-game StationFacility enum */
|
||||||
WAYPOINT_RAIL = ::FACIL_TRAIN, ///< Rail waypoint
|
WAYPOINT_RAIL = (int)::FACIL_TRAIN, ///< Rail waypoint
|
||||||
WAYPOINT_BUOY = ::FACIL_DOCK, ///< Buoy
|
WAYPOINT_BUOY = (int)::FACIL_DOCK, ///< Buoy
|
||||||
WAYPOINT_ANY = WAYPOINT_RAIL | WAYPOINT_BUOY, ///< All waypoint types
|
WAYPOINT_ANY = WAYPOINT_RAIL | WAYPOINT_BUOY, ///< All waypoint types
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user