From d44bb21d975083c46cea81e128d11e4dd1a2ef20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Thu, 21 Oct 2021 19:58:42 +0300 Subject: [PATCH] Refactor explicit constructor usage in BannerSetStyleAction --- src/openrct2/actions/BannerSetStyleAction.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/openrct2/actions/BannerSetStyleAction.cpp b/src/openrct2/actions/BannerSetStyleAction.cpp index 6407112795..a27055f97f 100644 --- a/src/openrct2/actions/BannerSetStyleAction.cpp +++ b/src/openrct2/actions/BannerSetStyleAction.cpp @@ -50,7 +50,7 @@ GameActions::Result::Ptr BannerSetStyleAction::Query() const if (banner == nullptr) { log_error("Invalid banner index: index = %u", _bannerIndex); - return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } res->Expenditure = ExpenditureType::Landscaping; @@ -62,7 +62,7 @@ GameActions::Result::Ptr BannerSetStyleAction::Query() const if (tileElement == nullptr) { log_error("Could not find banner index = %u", _bannerIndex); - return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } switch (_type) @@ -71,7 +71,7 @@ GameActions::Result::Ptr BannerSetStyleAction::Query() const if (_parameter > 31) { log_error("Invalid primary colour: colour = %u", _parameter); - return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } break; @@ -79,19 +79,19 @@ GameActions::Result::Ptr BannerSetStyleAction::Query() const if (_parameter > 13) { log_error("Invalid text colour: colour = %u", _parameter); - return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } break; case BannerSetStyleType::NoEntry: if (tileElement->AsBanner() == nullptr) { log_error("Tile element was not a banner."); - return MakeResult(GameActions::Status::Unknown, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::Unknown, STR_CANT_REPAINT_THIS, STR_NONE); } break; default: log_error("Invalid type: %u", _type); - return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } return res; } @@ -104,7 +104,7 @@ GameActions::Result::Ptr BannerSetStyleAction::Execute() const if (banner == nullptr) { log_error("Invalid banner index: index = %u", _bannerIndex); - return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } res->Expenditure = ExpenditureType::Landscaping; @@ -116,7 +116,7 @@ GameActions::Result::Ptr BannerSetStyleAction::Execute() const if (tileElement == nullptr) { log_error("Could not find banner index = %u", _bannerIndex); - return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } switch (_type) @@ -133,7 +133,7 @@ GameActions::Result::Ptr BannerSetStyleAction::Execute() const if (bannerElement == nullptr) { log_error("Tile element was not a banner."); - return MakeResult(GameActions::Status::Unknown, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::Unknown, STR_CANT_REPAINT_THIS, STR_NONE); } banner->flags &= ~BANNER_FLAG_NO_ENTRY; @@ -148,7 +148,7 @@ GameActions::Result::Ptr BannerSetStyleAction::Execute() const } default: log_error("Invalid type: %u", _type); - return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS); + return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } auto intent = Intent(INTENT_ACTION_UPDATE_BANNER);