From 125fa12d6f3fdc9ada0970f4b808c7ab6905e7e6 Mon Sep 17 00:00:00 2001 From: Peter Froud Date: Sat, 16 Mar 2024 21:55:44 -0700 Subject: [PATCH] Remove redundant word ("index. index = %u") --- src/openrct2/actions/BannerRemoveAction.cpp | 8 ++++---- src/openrct2/actions/BannerSetColourAction.cpp | 4 ++-- src/openrct2/actions/BannerSetStyleAction.cpp | 8 ++++---- src/openrct2/actions/LandBuyRightsAction.cpp | 4 ++-- src/openrct2/actions/LandSetRightsAction.cpp | 2 +- src/openrct2/actions/LargeScenerySetColourAction.cpp | 6 +++--- src/openrct2/actions/RideSetVehicleAction.cpp | 4 ++-- src/openrct2/actions/SignSetStyleAction.cpp | 4 ++-- src/openrct2/actions/StaffFireAction.cpp | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/openrct2/actions/BannerRemoveAction.cpp b/src/openrct2/actions/BannerRemoveAction.cpp index 33274c9954..993baf955b 100644 --- a/src/openrct2/actions/BannerRemoveAction.cpp +++ b/src/openrct2/actions/BannerRemoveAction.cpp @@ -70,14 +70,14 @@ GameActions::Result BannerRemoveAction::Query() const auto bannerIndex = bannerElement->GetIndex(); if (bannerIndex == BannerIndex::GetNull()) { - LOG_ERROR("Invalid banner index. index = %u", bannerIndex); + LOG_ERROR("Invalid banner index %u", bannerIndex); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE); } auto banner = bannerElement->GetBanner(); if (banner == nullptr) { - LOG_ERROR("Invalid banner index. index = %u", bannerIndex); + LOG_ERROR("Invalid banner index %u", bannerIndex); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE); } @@ -109,14 +109,14 @@ GameActions::Result BannerRemoveAction::Execute() const auto bannerIndex = bannerElement->GetIndex(); if (bannerIndex == BannerIndex::GetNull()) { - LOG_ERROR("Invalid banner index. index = %u", bannerIndex); + LOG_ERROR("Invalid banner index %u", bannerIndex); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE); } auto banner = bannerElement->GetBanner(); if (banner == nullptr) { - LOG_ERROR("Invalid banner index. index = %u", bannerIndex); + LOG_ERROR("Invalid banner index %u", bannerIndex); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE); } diff --git a/src/openrct2/actions/BannerSetColourAction.cpp b/src/openrct2/actions/BannerSetColourAction.cpp index bcaae63230..95c421986f 100644 --- a/src/openrct2/actions/BannerSetColourAction.cpp +++ b/src/openrct2/actions/BannerSetColourAction.cpp @@ -66,7 +66,7 @@ GameActions::Result BannerSetColourAction::QueryExecute(bool isExecuting) const if (_primaryColour > 31) { - LOG_ERROR("Invalid primary colour: colour = %u", _primaryColour); + LOG_ERROR("Invalid primary colour %u", _primaryColour); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } @@ -87,7 +87,7 @@ GameActions::Result BannerSetColourAction::QueryExecute(bool isExecuting) const auto banner = GetBanner(index); if (banner == nullptr) { - LOG_ERROR("Invalid banner index: index = %u", index); + LOG_ERROR("Invalid banner index %u", index); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } diff --git a/src/openrct2/actions/BannerSetStyleAction.cpp b/src/openrct2/actions/BannerSetStyleAction.cpp index 73ef718e83..f4b18de9ee 100644 --- a/src/openrct2/actions/BannerSetStyleAction.cpp +++ b/src/openrct2/actions/BannerSetStyleAction.cpp @@ -49,7 +49,7 @@ GameActions::Result BannerSetStyleAction::Query() const auto banner = GetBanner(_bannerIndex); if (banner == nullptr) { - LOG_ERROR("Invalid banner index: index = %u", _bannerIndex); + LOG_ERROR("Invalid banner index %u", _bannerIndex); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } @@ -70,7 +70,7 @@ GameActions::Result BannerSetStyleAction::Query() const case BannerSetStyleType::PrimaryColour: if (_parameter > COLOUR_COUNT) { - LOG_ERROR("Invalid primary colour: colour = %u", _parameter); + LOG_ERROR("Invalid primary colour %u", _parameter); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } break; @@ -78,7 +78,7 @@ GameActions::Result BannerSetStyleAction::Query() const case BannerSetStyleType::TextColour: if (_parameter > 13) { - LOG_ERROR("Invalid text colour: colour = %u", _parameter); + LOG_ERROR("Invalid text colour %u", _parameter); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } break; @@ -103,7 +103,7 @@ GameActions::Result BannerSetStyleAction::Execute() const auto banner = GetBanner(_bannerIndex); if (banner == nullptr) { - LOG_ERROR("Invalid banner index: index = %u", _bannerIndex); + LOG_ERROR("Invalid banner index %u", _bannerIndex); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } diff --git a/src/openrct2/actions/LandBuyRightsAction.cpp b/src/openrct2/actions/LandBuyRightsAction.cpp index 71c0f54824..36d7c73ab1 100644 --- a/src/openrct2/actions/LandBuyRightsAction.cpp +++ b/src/openrct2/actions/LandBuyRightsAction.cpp @@ -113,7 +113,7 @@ GameActions::Result LandBuyRightsAction::MapBuyLandRightsForTile(const CoordsXY& { if (_setting >= LandBuyRightSetting::Count) { - LOG_ERROR("Tried calling buy land rights with an incorrect setting. setting = %u", _setting); + LOG_ERROR("Tried calling buy land rights with an incorrect setting %u", _setting); return GameActions::Result(GameActions::Status::InvalidParameters, _ErrorTitles[0], STR_NONE); } @@ -170,7 +170,7 @@ GameActions::Result LandBuyRightsAction::MapBuyLandRightsForTile(const CoordsXY& return res; default: - LOG_ERROR("Tried calling buy land rights with an incorrect setting. setting = %u", _setting); + LOG_ERROR("Tried calling buy land rights with an incorrect setting %u", _setting); return GameActions::Result(GameActions::Status::InvalidParameters, _ErrorTitles[0], STR_NONE); } } diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp index f3f4998542..223bd50e9a 100644 --- a/src/openrct2/actions/LandSetRightsAction.cpp +++ b/src/openrct2/actions/LandSetRightsAction.cpp @@ -205,7 +205,7 @@ GameActions::Result LandSetRightsAction::MapBuyLandRightsForTile(const CoordsXY& return res; } default: - LOG_ERROR("Tried calling set land rights with an incorrect setting. setting = %u", _setting); + LOG_ERROR("Tried calling set land rights with an incorrect setting %u", _setting); return GameActions::Result( GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } diff --git a/src/openrct2/actions/LargeScenerySetColourAction.cpp b/src/openrct2/actions/LargeScenerySetColourAction.cpp index e53ecefda1..45baec04fb 100644 --- a/src/openrct2/actions/LargeScenerySetColourAction.cpp +++ b/src/openrct2/actions/LargeScenerySetColourAction.cpp @@ -75,19 +75,19 @@ GameActions::Result LargeScenerySetColourAction::QueryExecute(bool isExecuting) if (_primaryColour >= COLOUR_COUNT) { - LOG_ERROR("Invalid primary colour: colour = %u", _primaryColour); + LOG_ERROR("Invalid primary colour %u", _primaryColour); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } if (_secondaryColour >= COLOUR_COUNT) { - LOG_ERROR("Invalid secondary colour: colour = %u", _secondaryColour); + LOG_ERROR("Invalid secondary colour %u", _secondaryColour); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } if (_tertiaryColour >= COLOUR_COUNT) { - LOG_ERROR("Invalid tertiary colour: colour = %u", _tertiaryColour); + LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } diff --git a/src/openrct2/actions/RideSetVehicleAction.cpp b/src/openrct2/actions/RideSetVehicleAction.cpp index 0c393c2753..2215d0c820 100644 --- a/src/openrct2/actions/RideSetVehicleAction.cpp +++ b/src/openrct2/actions/RideSetVehicleAction.cpp @@ -66,7 +66,7 @@ GameActions::Result RideSetVehicleAction::Query() const { if (_type >= RideSetVehicleType::Count) { - LOG_ERROR("Invalid type. type = %d", _type); + LOG_ERROR("Invalid type %d", _type); } auto errTitle = SetVehicleTypeErrorTitle[EnumValue(_type)]; @@ -97,7 +97,7 @@ GameActions::Result RideSetVehicleAction::Query() const { if (!RideIsVehicleTypeValid(*ride)) { - LOG_ERROR("Invalid vehicle type. type = %d", _value); + LOG_ERROR("Invalid vehicle type %d", _value); return GameActions::Result(GameActions::Status::InvalidParameters, errTitle, STR_NONE); } auto rideEntry = GetRideEntryByIndex(_value); diff --git a/src/openrct2/actions/SignSetStyleAction.cpp b/src/openrct2/actions/SignSetStyleAction.cpp index 66a7bbf765..21bea7e237 100644 --- a/src/openrct2/actions/SignSetStyleAction.cpp +++ b/src/openrct2/actions/SignSetStyleAction.cpp @@ -50,7 +50,7 @@ GameActions::Result SignSetStyleAction::Query() const auto banner = GetBanner(_bannerIndex); if (banner == nullptr) { - LOG_ERROR("Invalid banner id. id = %u", _bannerIndex); + LOG_ERROR("Invalid banner id %u", _bannerIndex); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } @@ -87,7 +87,7 @@ GameActions::Result SignSetStyleAction::Execute() const auto banner = GetBanner(_bannerIndex); if (banner == nullptr) { - LOG_ERROR("Invalid banner id. id = %u", _bannerIndex); + LOG_ERROR("Invalid banner id %u", _bannerIndex); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } diff --git a/src/openrct2/actions/StaffFireAction.cpp b/src/openrct2/actions/StaffFireAction.cpp index 9bf45c6a93..bc5542de69 100644 --- a/src/openrct2/actions/StaffFireAction.cpp +++ b/src/openrct2/actions/StaffFireAction.cpp @@ -38,7 +38,7 @@ GameActions::Result StaffFireAction::Query() const { if (_spriteId.ToUnderlying() >= MAX_ENTITIES || _spriteId.IsNull()) { - LOG_ERROR("Invalid spriteId. spriteId = %u", _spriteId); + LOG_ERROR("Invalid spriteId %u", _spriteId); return GameActions::Result( GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } @@ -46,7 +46,7 @@ GameActions::Result StaffFireAction::Query() const auto staff = TryGetEntity(_spriteId); if (staff == nullptr) { - LOG_ERROR("Invalid spriteId. spriteId = %u", _spriteId); + LOG_ERROR("Invalid spriteId %u", _spriteId); return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND); } @@ -67,7 +67,7 @@ GameActions::Result StaffFireAction::Execute() const auto staff = TryGetEntity(_spriteId); if (staff == nullptr) { - LOG_ERROR("Invalid spriteId. spriteId = %u", _spriteId); + LOG_ERROR("Invalid spriteId %u", _spriteId); return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND); } WindowCloseByClass(WindowClass::FirePrompt);