Mercurial > hg > openttd
changeset 18920:ef21aa7fc5f1 draft
(svn r23770) -Fix: compilation with GCC 4.7
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Sat, 07 Jan 2012 18:37:22 +0000 |
| parents | f614f7d9f8f3 |
| children | b8771536613a |
| files | src/script/api/script_station.hpp src/script/api/script_waypoint.hpp |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/script/api/script_station.hpp +++ b/src/script/api/script_station.hpp @@ -44,11 +44,11 @@ */ 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 };
--- a/src/script/api/script_waypoint.hpp +++ b/src/script/api/script_waypoint.hpp @@ -41,8 +41,8 @@ */ 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 };