From 70ef8151fcade2a0449a2a2d77a04861dc528d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 9 Feb 2019 22:54:33 +0100 Subject: [PATCH] Fix types passed to printf-like functions --- src/openrct2/actions/MazeSetTrackAction.hpp | 2 +- src/openrct2/actions/RideDemolishAction.hpp | 4 ++-- src/openrct2/actions/RideSetAppearanceAction.hpp | 6 +++--- src/openrct2/actions/RideSetName.hpp | 4 ++-- src/openrct2/actions/RideSetStatus.hpp | 4 ++-- src/openrct2/object/ObjectRepository.cpp | 7 ++++--- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/openrct2/actions/MazeSetTrackAction.hpp b/src/openrct2/actions/MazeSetTrackAction.hpp index 8b164817d0..3c72c3fd5c 100644 --- a/src/openrct2/actions/MazeSetTrackAction.hpp +++ b/src/openrct2/actions/MazeSetTrackAction.hpp @@ -217,7 +217,7 @@ public: if (tileElement == nullptr) { Ride* ride = get_ride(_rideIndex); - openrct2_assert(ride != nullptr, "Invalid ride index: %d\n", _rideIndex); + openrct2_assert(ride != nullptr, "Invalid ride index: %d\n", uint32_t(_rideIndex)); money32 price = (((RideTrackCosts[ride->type].track_price * TrackPricing[TRACK_ELEM_MAZE]) >> 16)); res->Cost = price / 2 * 10; diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp index a57344882e..aa39e64a74 100644 --- a/src/openrct2/actions/RideDemolishAction.hpp +++ b/src/openrct2/actions/RideDemolishAction.hpp @@ -56,7 +56,7 @@ public: Ride* ride = get_ride(_rideIndex); if (ride->type == RIDE_TYPE_NULL) { - log_warning("Invalid game command for ride %u", _rideIndex); + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_CANT_DEMOLISH_RIDE, STR_NONE); } @@ -101,7 +101,7 @@ public: Ride* ride = get_ride(_rideIndex); if (ride->type == RIDE_TYPE_NULL) { - log_warning("Invalid game command for ride %u", _rideIndex); + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_CANT_DEMOLISH_RIDE, STR_NONE); } diff --git a/src/openrct2/actions/RideSetAppearanceAction.hpp b/src/openrct2/actions/RideSetAppearanceAction.hpp index 8e8e2cd36b..81fa11f4f3 100644 --- a/src/openrct2/actions/RideSetAppearanceAction.hpp +++ b/src/openrct2/actions/RideSetAppearanceAction.hpp @@ -70,14 +70,14 @@ 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 std::make_unique(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 std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_NONE); } @@ -117,7 +117,7 @@ public: Ride* ride = get_ride(_rideIndex); if (ride == nullptr) { - log_warning("Invalid game command, ride_id = %u", _rideIndex); + log_warning("Invalid game command, ride_id = %u", uint32_t(_rideIndex)); return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_NONE); } diff --git a/src/openrct2/actions/RideSetName.hpp b/src/openrct2/actions/RideSetName.hpp index 6b66f7eea2..d94f533d0f 100644 --- a/src/openrct2/actions/RideSetName.hpp +++ b/src/openrct2/actions/RideSetName.hpp @@ -55,7 +55,7 @@ public: Ride* ride = get_ride(_rideIndex); if (ride->type == RIDE_TYPE_NULL) { - log_warning("Invalid game command for ride %u", _rideIndex); + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_CANT_RENAME_RIDE_ATTRACTION, STR_NONE); } @@ -85,7 +85,7 @@ public: Ride* ride = get_ride(_rideIndex); if (ride->type == RIDE_TYPE_NULL) { - log_warning("Invalid game command for ride %u", _rideIndex); + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_CANT_RENAME_RIDE_ATTRACTION, STR_NONE); } diff --git a/src/openrct2/actions/RideSetStatus.hpp b/src/openrct2/actions/RideSetStatus.hpp index ade266196c..9b78dc82d2 100644 --- a/src/openrct2/actions/RideSetStatus.hpp +++ b/src/openrct2/actions/RideSetStatus.hpp @@ -65,7 +65,7 @@ public: if (_rideIndex >= MAX_RIDES || _rideIndex < 0) { - log_warning("Invalid game command for ride %u", _rideIndex); + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); res->Error = GA_ERROR::INVALID_PARAMETERS; res->ErrorMessage = STR_INVALID_SELECTION_OF_OBJECTS; return res; @@ -107,7 +107,7 @@ public: if (ride->type == RIDE_TYPE_NULL) { - log_warning("Invalid game command for ride %u", _rideIndex); + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); res->Error = GA_ERROR::INVALID_PARAMETERS; res->ErrorMessage = STR_INVALID_SELECTION_OF_OBJECTS; return res; diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index c1bd1d0af5..0f4babf4bb 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -342,9 +342,10 @@ public: void AddObjectFromFile(const std::string_view& objectName, const void* data, size_t dataSize) override { utf8 path[MAX_PATH]; - GetPathForNewObject(path, sizeof(path), std::string(objectName).c_str()); + std::string objectNameString(objectName); + GetPathForNewObject(path, sizeof(path), objectNameString.c_str()); - log_verbose("Adding object: [%s]", objectName); + log_verbose("Adding object: [%s]", objectNameString.c_str()); try { File::WriteAllBytes(path, data, dataSize); @@ -352,7 +353,7 @@ public: } catch (const std::exception&) { - Console::Error::WriteLine("Failed saving object: [%s] to '%s'.", objectName, path); + Console::Error::WriteLine("Failed saving object: [%s] to '%s'.", objectNameString.c_str(), path); } }