From 379fd42dc48ec6fa36fb3b94d39d02e5701eba41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 9 Feb 2019 22:55:22 +0100 Subject: [PATCH] Fix types passed to ride_type_has_flag --- src/openrct2/actions/RideSetPriceAction.hpp | 10 +++++----- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/Ride.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openrct2/actions/RideSetPriceAction.hpp b/src/openrct2/actions/RideSetPriceAction.hpp index 4a4f8ed483..c76254c0f4 100644 --- a/src/openrct2/actions/RideSetPriceAction.hpp +++ b/src/openrct2/actions/RideSetPriceAction.hpp @@ -59,21 +59,21 @@ public: if (_rideIndex >= MAX_RIDES || _rideIndex == RIDE_ID_NULL) { - log_warning("Invalid game command for ride %u", _rideIndex); + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); } Ride* ride = get_ride(_rideIndex); if (ride == nullptr || ride->type == RIDE_TYPE_NULL) { - log_warning("Invalid game command, ride_id = %u", _rideIndex); + log_warning("Invalid game command, ride_id = %u", uint32_t(_rideIndex)); return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); } rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); if (rideEntry == nullptr) { - log_warning("Invalid game command for ride %u", _rideIndex); + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); } @@ -88,14 +88,14 @@ public: Ride* ride = get_ride(_rideIndex); if (ride == nullptr || ride->type == RIDE_TYPE_NULL) { - log_warning("Invalid game command, ride_id = %u", _rideIndex); + log_warning("Invalid game command, ride_id = %u", uint32_t(_rideIndex)); return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); } rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); if (rideEntry == nullptr) { - log_warning("Invalid game command for ride %u", _rideIndex); + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); } diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 98cafd109a..c273ee553a 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -6389,7 +6389,7 @@ void game_command_callback_ride_remove_track_piece( window_ride_construction_mouseup_demolish_next_piece(x, y, z, direction, type); } -bool ride_type_has_flag(int32_t rideType, int32_t flag) +bool ride_type_has_flag(int32_t rideType, uint32_t flag) { return (RideProperties[rideType].flags & flag) != 0; } diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 0a70829873..d75a7dacfd 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -1109,7 +1109,7 @@ bool ride_has_log_reverser(Ride* ride); bool ride_has_waterfall(Ride* ride); bool ride_has_whirlpool(Ride* ride); -bool ride_type_has_flag(int32_t rideType, int32_t flag); +bool ride_type_has_flag(int32_t rideType, uint32_t flag); bool ride_is_powered_launched(Ride* ride); bool ride_is_block_sectioned(Ride* ride); bool ride_has_any_track_elements(ride_id_t rideIndex);