From f49fe68cc6d257aea61626a47c560c38fa454b5d Mon Sep 17 00:00:00 2001 From: Peter Froud Date: Sat, 16 Mar 2024 23:27:06 -0700 Subject: [PATCH] Improve messages for default case in switch stmt --- src/openrct2/actions/BannerSetStyleAction.cpp | 4 ++-- src/openrct2/actions/CheatSetAction.cpp | 2 +- src/openrct2/actions/LandBuyRightsAction.cpp | 2 +- src/openrct2/actions/LandSetRightsAction.cpp | 2 +- src/openrct2/actions/LandSmoothAction.cpp | 2 +- src/openrct2/actions/PeepPickupAction.cpp | 4 ++-- src/openrct2/actions/RideSetSettingAction.cpp | 2 +- src/openrct2/actions/RideSetStatusAction.cpp | 2 +- src/openrct2/actions/RideSetVehicleAction.cpp | 4 ++-- src/openrct2/actions/ScenarioSetSettingAction.cpp | 2 +- src/openrct2/actions/TileModifyAction.cpp | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/openrct2/actions/BannerSetStyleAction.cpp b/src/openrct2/actions/BannerSetStyleAction.cpp index 389e772b2e..7b4e515b2a 100644 --- a/src/openrct2/actions/BannerSetStyleAction.cpp +++ b/src/openrct2/actions/BannerSetStyleAction.cpp @@ -90,7 +90,7 @@ GameActions::Result BannerSetStyleAction::Query() const } break; default: - LOG_ERROR("Invalid type: %u", _type); + LOG_ERROR("Invalid banner style type %u", _type); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } return res; @@ -147,7 +147,7 @@ GameActions::Result BannerSetStyleAction::Execute() const break; } default: - LOG_ERROR("Invalid type: %u", _type); + LOG_ERROR("Invalid banner style type %u", _type); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index 929ad83a06..7de0876370 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -259,7 +259,7 @@ GameActions::Result CheatSetAction::Execute() const break; default: { - LOG_ERROR("Unabled cheat: %d", _cheatType.id); + LOG_ERROR("Invalid cheat type %d", _cheatType.id); return GameActions::Result( GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } diff --git a/src/openrct2/actions/LandBuyRightsAction.cpp b/src/openrct2/actions/LandBuyRightsAction.cpp index 36d7c73ab1..a5c299f66d 100644 --- a/src/openrct2/actions/LandBuyRightsAction.cpp +++ b/src/openrct2/actions/LandBuyRightsAction.cpp @@ -170,7 +170,7 @@ GameActions::Result LandBuyRightsAction::MapBuyLandRightsForTile(const CoordsXY& return res; default: - LOG_ERROR("Tried calling buy land rights with an incorrect setting %u", _setting); + LOG_ERROR("Invalid land buying 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 223bd50e9a..e186ebe565 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 %u", _setting); + LOG_ERROR("Invalid setting %u to set land rights", _setting); return GameActions::Result( GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } diff --git a/src/openrct2/actions/LandSmoothAction.cpp b/src/openrct2/actions/LandSmoothAction.cpp index bd311172d4..f60c26e8b1 100644 --- a/src/openrct2/actions/LandSmoothAction.cpp +++ b/src/openrct2/actions/LandSmoothAction.cpp @@ -607,7 +607,7 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const break; } default: - LOG_ERROR("Invalid map selection %u", _selectionType); + LOG_ERROR("Invalid map selection type %u", _selectionType); return GameActions::Result(GameActions::Status::InvalidParameters, std::get(res.ErrorTitle), STR_NONE); } // switch selectionType diff --git a/src/openrct2/actions/PeepPickupAction.cpp b/src/openrct2/actions/PeepPickupAction.cpp index 6cee870058..3978d3ddee 100644 --- a/src/openrct2/actions/PeepPickupAction.cpp +++ b/src/openrct2/actions/PeepPickupAction.cpp @@ -106,7 +106,7 @@ GameActions::Result PeepPickupAction::Query() const } break; default: - LOG_ERROR("Invalid pickup type: %u", _type); + LOG_ERROR("Invalid peep pickup type %u", _type); return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_CANT_PLACE_PERSON_HERE, STR_NONE); } return res; @@ -175,7 +175,7 @@ GameActions::Result PeepPickupAction::Execute() const CancelConcurrentPickups(peep); break; default: - LOG_ERROR("Invalid pickup type: %u", _type); + LOG_ERROR("Invalid peep pickup type %u", _type); return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_CANT_PLACE_PERSON_HERE, STR_NONE); } return res; diff --git a/src/openrct2/actions/RideSetSettingAction.cpp b/src/openrct2/actions/RideSetSettingAction.cpp index 9600d5b0a6..4d1b926937 100644 --- a/src/openrct2/actions/RideSetSettingAction.cpp +++ b/src/openrct2/actions/RideSetSettingAction.cpp @@ -147,7 +147,7 @@ GameActions::Result RideSetSettingAction::Query() const } break; default: - LOG_ERROR("Invalid RideSetSetting: %u", static_cast(_setting)); + LOG_ERROR("Invalid ride setting %u", static_cast(_setting)); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_CHANGE_OPERATING_MODE, STR_NONE); } diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp index daa37bc1f4..f39cefb0c2 100644 --- a/src/openrct2/actions/RideSetStatusAction.cpp +++ b/src/openrct2/actions/RideSetStatusAction.cpp @@ -238,7 +238,7 @@ GameActions::Result RideSetStatusAction::Execute() const break; } default: - Guard::Assert(false, "Invalid status passed: %u", _status); + Guard::Assert(false, "Invalid ride status %u", _status); break; } auto windowManager = OpenRCT2::GetContext()->GetUiContext()->GetWindowManager(); diff --git a/src/openrct2/actions/RideSetVehicleAction.cpp b/src/openrct2/actions/RideSetVehicleAction.cpp index b811aef423..a852bfc866 100644 --- a/src/openrct2/actions/RideSetVehicleAction.cpp +++ b/src/openrct2/actions/RideSetVehicleAction.cpp @@ -118,7 +118,7 @@ GameActions::Result RideSetVehicleAction::Query() const } default: - LOG_ERROR("Unknown vehicle command. type = %d", _type); + LOG_ERROR("Invalid ride vehicle setting %d", _type); return GameActions::Result(GameActions::Status::InvalidParameters, errTitle, STR_NONE); } @@ -200,7 +200,7 @@ GameActions::Result RideSetVehicleAction::Execute() const } default: - LOG_ERROR("Unknown vehicle command. type = %d", _type); + LOG_ERROR("Invalid ride vehicle setting %d", _type); return GameActions::Result(GameActions::Status::InvalidParameters, errTitle, STR_NONE); } diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp index bc64961cc0..2cf1857ca7 100644 --- a/src/openrct2/actions/ScenarioSetSettingAction.cpp +++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp @@ -264,7 +264,7 @@ GameActions::Result ScenarioSetSettingAction::Execute() const break; } default: - LOG_ERROR("Invalid setting: %u", _setting); + LOG_ERROR("Invalid scenario 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/TileModifyAction.cpp b/src/openrct2/actions/TileModifyAction.cpp index 44da0b27d4..67fcd5677a 100644 --- a/src/openrct2/actions/TileModifyAction.cpp +++ b/src/openrct2/actions/TileModifyAction.cpp @@ -230,7 +230,7 @@ GameActions::Result TileModifyAction::QueryExecute(bool isExecuting) const break; } default: - LOG_ERROR("invalid instruction"); + LOG_ERROR("Invalid tile modification type %u", _setting); return GameActions::Result( GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); }