mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

MSVC fixes pt 5

Browse Source
This commit is contained in:
Michał Janiszewski
2018-01-10 21:17:33 +01:00
committed by Michał Janiszewski
parent f50ce343a2
commit 19d35e6898
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/ride/Ride.h
View File

@@ -763,7 +763,7 @@ enum {
RIDE_ELEMENT_WHIRLPOOL = 1 << 7
};
enum {
enum ride_type_flags {
RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN = 1 << 0,
RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_ADDITIONAL = 1 << 1,
RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS = 1 << 2,
@@ -797,6 +797,10 @@ enum {
RIDE_TYPE_FLAG_HAS_LARGE_CURVES = 1 << 30, // whether the ride supports large (45 degree turn) curves
RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR = 1u << 31,
};
#ifdef __cplusplus
// Hack for MSVC which thinks RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR = 1u << 31 is signed and generates narrowing conversion warnings
constexpr inline uint32 operator | (ride_type_flags a, ride_type_flags b) { return static_cast<ride_type_flags>(static_cast<uint32>(a) | static_cast<uint32>(b)); }
#endif
enum {
RIDE_CRASH_TYPE_NONE = 0,