mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Refactor explicit constructor usage in BannerSetStyleAction

Browse Source
This commit is contained in:
ζeh Matt
2021-10-21 19:58:42 +03:00
parent c4ea5732ea
commit d44bb21d97
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/actions/BannerSetStyleAction.cpp
View File

@@ -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);