mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Remove unnecessary pops from some strings (#17805)

Browse Source
This commit is contained in:
Michael Steenbeek
2022-08-13 20:12:30 +02:00
committed by GitHub
parent a187e10819
commit 49215a52cf
5 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@@ -282,12 +282,10 @@ public:
auto ft = Formatter::Common();
if (currentRide != nullptr)
{
ft.Increment(4);
currentRide->FormatNameTo(ft);
}
else
{
ft.Increment(4);
ft.Add<StringId>(STR_NONE);
}
}

1
src/openrct2-ui/windows/RideConstruction.cpp
View File

@@ -1479,7 +1479,6 @@ public:
// Set window title arguments
ft = Formatter::Common();
ft.Increment(4);
currentRide->FormatNameTo(ft);
}

1
src/openrct2/actions/RideSetStatusAction.cpp
View File

@@ -79,7 +79,6 @@ GameActions::Result RideSetStatusAction::Query() const
res.ErrorTitle = _StatusErrorTitles[EnumValue(_status)];
Formatter ft(res.ErrorMessageArgs.data());
ft.Increment(6);
ride->FormatNameTo(ft);
if (_status != ride->status)
{

3
src/openrct2/ride/RideConstruction.cpp
View File

@@ -103,7 +103,6 @@ static int32_t ride_check_if_construction_allowed(Ride* ride)
}
if (ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)
{
ft.Increment(6);
ride->FormatNameTo(ft);
context_show_error(STR_CANT_START_CONSTRUCTION_ON, STR_HAS_BROKEN_DOWN_AND_REQUIRES_FIXING, ft);
return 0;
@@ -111,7 +110,6 @@ static int32_t ride_check_if_construction_allowed(Ride* ride)
if (ride->status != RideStatus::Closed && ride->status != RideStatus::Simulating)
{
ft.Increment(6);
ride->FormatNameTo(ft);
context_show_error(STR_CANT_START_CONSTRUCTION_ON, STR_MUST_BE_CLOSED_FIRST, ft);
return 0;
@@ -1005,7 +1003,6 @@ bool ride_modify(const CoordsXYE& input)
if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE)
{
Formatter ft;
ft.Increment(6);
ride->FormatNameTo(ft);
context_show_error(
STR_CANT_START_CONSTRUCTION_ON, STR_LOCAL_AUTHORITY_FORBIDS_DEMOLITION_OR_MODIFICATIONS_TO_THIS_RIDE, ft);