1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00

Refactor explicit constructor usage in FootpathAdditionRemoveAction

This commit is contained in:
ζeh Matt
2021-10-21 19:56:32 +03:00
parent 520053a9ff
commit f207ad4f64

View File

@@ -68,20 +68,20 @@ GameActions::Result::Ptr FootpathAdditionRemoveAction::Query() const
if (tileElement == nullptr)
{
log_warning("Could not find path element.");
return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS);
return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE);
}
auto pathElement = tileElement->AsPath();
if (pathElement == nullptr)
{
log_warning("Could not find path element.");
return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS);
return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE);
}
if (!pathElement->AdditionIsGhost() && (GetFlags() & GAME_COMMAND_FLAG_GHOST))
{
log_warning("Tried to remove non ghost during ghost removal.");
return MakeResult(GameActions::Status::Disallowed, STR_CANT_REMOVE_THIS);
return MakeResult(GameActions::Status::Disallowed, STR_CANT_REMOVE_THIS, STR_NONE);
}
auto res = MakeResult();
res->Position = _loc;
@@ -102,7 +102,7 @@ GameActions::Result::Ptr FootpathAdditionRemoveAction::Execute() const
if (pathElement == nullptr)
{
log_error("Could not find path element.");
return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS);
return MakeResult(GameActions::Status::InvalidParameters, STR_CANT_REMOVE_THIS, STR_NONE);
}
pathElement->SetAddition(0);