diff options
| author | smatz <smatz@openttd.org> | 2012-01-07 18:37:22 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2012-01-07 18:37:22 +0000 |
| commit | 24bf6ea4955dad7c2dd65214fc500b08d2b9cbee (patch) | |
| tree | 14fe48034bed78cc39153315e241bab5dc6bb8ed /src/script | |
| parent | 182969f53159401a57fca5801a352e7aa3ffda77 (diff) | |
| download | openttd-24bf6ea4955dad7c2dd65214fc500b08d2b9cbee.tar.xz | |
(svn r23770) -Fix: compilation with GCC 4.7
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/script_station.hpp | 10 | ||||
| -rw-r--r-- | src/script/api/script_waypoint.hpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/script/api/script_station.hpp b/src/script/api/script_station.hpp index b6da4a913..268a0bce4 100644 --- a/src/script/api/script_station.hpp +++ b/src/script/api/script_station.hpp @@ -44,11 +44,11 @@ public: */ enum StationType { /* Note: these values represent part of the in-game StationFacility enum */ - STATION_TRAIN = ::FACIL_TRAIN, ///< Train station - STATION_TRUCK_STOP = ::FACIL_TRUCK_STOP, ///< Truck station - STATION_BUS_STOP = ::FACIL_BUS_STOP, ///< Bus station - STATION_AIRPORT = ::FACIL_AIRPORT, ///< Airport - STATION_DOCK = ::FACIL_DOCK, ///< Dock + STATION_TRAIN = (int)::FACIL_TRAIN, ///< Train station + STATION_TRUCK_STOP = (int)::FACIL_TRUCK_STOP, ///< Truck station + STATION_BUS_STOP = (int)::FACIL_BUS_STOP, ///< Bus station + STATION_AIRPORT = (int)::FACIL_AIRPORT, ///< Airport + STATION_DOCK = (int)::FACIL_DOCK, ///< Dock STATION_ANY = STATION_TRAIN | STATION_TRUCK_STOP | STATION_BUS_STOP | STATION_AIRPORT | STATION_DOCK, ///< All station types }; diff --git a/src/script/api/script_waypoint.hpp b/src/script/api/script_waypoint.hpp index afbc435f6..7a8b4c97b 100644 --- a/src/script/api/script_waypoint.hpp +++ b/src/script/api/script_waypoint.hpp @@ -41,8 +41,8 @@ public: */ enum WaypointType { /* Note: these values represent part of the in-game StationFacility enum */ - WAYPOINT_RAIL = ::FACIL_TRAIN, ///< Rail waypoint - WAYPOINT_BUOY = ::FACIL_DOCK, ///< Buoy + WAYPOINT_RAIL = (int)::FACIL_TRAIN, ///< Rail waypoint + WAYPOINT_BUOY = (int)::FACIL_DOCK, ///< Buoy WAYPOINT_ANY = WAYPOINT_RAIL | WAYPOINT_BUOY, ///< All waypoint types }; |