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

Refactor explicit constructor usage in RideEntranceExitRemoveAction

Browse Source
This commit is contained in:
ζeh Matt
2021-10-21 20:11:01 +03:00
parent 586147c8dc
commit 1014c84620
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/actions/RideEntranceExitRemoveAction.cpp
View File

@@ -75,22 +75,22 @@ GameActions::Result::Ptr RideEntranceExitRemoveAction::Query() const
if (ride == nullptr)
{
log_warning("Invalid ride id %d for entrance/exit removal", EnumValue(_rideIndex));
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE);
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
if (ride->status != RideStatus::Closed && ride->status != RideStatus::Simulating)
{
return MakeResult(GameActions::Status::InvalidParameters, STR_MUST_BE_CLOSED_FIRST);
return MakeResult(GameActions::Status::InvalidParameters, STR_MUST_BE_CLOSED_FIRST, STR_NONE);
}
if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK)
{
return MakeResult(GameActions::Status::InvalidParameters, STR_NOT_ALLOWED_TO_MODIFY_STATION);
return MakeResult(GameActions::Status::InvalidParameters, STR_NOT_ALLOWED_TO_MODIFY_STATION, STR_NONE);
}
if (!LocationValid(_loc))
{
return MakeResult(GameActions::Status::InvalidParameters, STR_LAND_NOT_OWNED_BY_PARK);
return MakeResult(GameActions::Status::InvalidParameters, STR_LAND_NOT_OWNED_BY_PARK, STR_NONE);
}
auto* entranceElement = FindEntranceElement(
@@ -101,7 +101,7 @@ GameActions::Result::Ptr RideEntranceExitRemoveAction::Query() const
log_warning(
"Track Element not found. x = %d, y = %d, ride = %d, station = %d", _loc.x, _loc.y, EnumValue(_rideIndex),
_stationNum);
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE);
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
return MakeResult();
@@ -113,7 +113,7 @@ GameActions::Result::Ptr RideEntranceExitRemoveAction::Execute() const
if (ride == nullptr)
{
log_warning("Invalid ride id %d for entrance/exit removal", EnumValue(_rideIndex));
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE);
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
const bool isGhost = GetFlags() & GAME_COMMAND_FLAG_GHOST;
@@ -132,7 +132,7 @@ GameActions::Result::Ptr RideEntranceExitRemoveAction::Execute() const
log_warning(
"Track Element not found. x = %d, y = %d, ride = %d, station = %d", _loc.x, _loc.y, EnumValue(_rideIndex),
_stationNum);
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE);
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
auto res = MakeResult();