diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index b82182689f..de75a37d99 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -282,7 +282,7 @@ STR_0892 :Screenshot saved to disk as ‘{STRINGID}’ STR_0893 :Screenshot failed! STR_0894 :Landscape data area full! STR_0895 :Can’t build partly above and partly below ground -STR_0896 :{POP16}{POP16}{STRINGID} Construction +STR_0896 :{STRINGID} Construction STR_0897 :Direction STR_0898 :Left-hand curve STR_0899 :Right-hand curve @@ -387,10 +387,10 @@ STR_0998 :No more stations allowed on this ride STR_0999 :Requires a station platform STR_1000 :Track is not a complete circuit STR_1001 :Track unsuitable for type of train -STR_1002 :Can’t open {POP16}{POP16}{POP16}{STRINGID}… -STR_1003 :Can’t test {POP16}{POP16}{POP16}{STRINGID}… -STR_1004 :Can’t close {POP16}{POP16}{POP16}{STRINGID}… -STR_1005 :Can’t start construction on {POP16}{POP16}{POP16}{STRINGID}… +STR_1002 :Can’t open {STRINGID}… +STR_1003 :Can’t test {STRINGID}… +STR_1004 :Can’t close {STRINGID}… +STR_1005 :Can’t start construction on {STRINGID}… STR_1006 :Must be closed first STR_1007 :Unable to create enough vehicles STR_1008 :Open, close, or test ride/attraction @@ -3431,7 +3431,7 @@ STR_6322 :{WINDOW_COLOUR_2}Sprite Id: {BLACK}{INT32} STR_6323 :Simulating STR_6324 :Simulate STR_6325 :Simulate ride/attraction -STR_6326 :Can’t simulate {POP16}{POP16}{POP16}{STRINGID}… +STR_6326 :Can’t simulate {STRINGID}… STR_6327 :Transparent background for giant screenshots STR_6328 :With this option enabled, giant screenshots will have a transparent background instead of the default black colour. STR_6329 :{STRING}{STRINGID} diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 6a1f7166b8..f33a15b384 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -282,12 +282,10 @@ public: auto ft = Formatter::Common(); if (currentRide != nullptr) { - ft.Increment(4); currentRide->FormatNameTo(ft); } else { - ft.Increment(4); ft.Add(STR_NONE); } } diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 1eefabd4d3..bcaef9db70 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -1479,7 +1479,6 @@ public: // Set window title arguments ft = Formatter::Common(); - ft.Increment(4); currentRide->FormatNameTo(ft); } diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp index 2f7985354c..59c2074c46 100644 --- a/src/openrct2/actions/RideSetStatusAction.cpp +++ b/src/openrct2/actions/RideSetStatusAction.cpp @@ -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) { diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index 77382f6b6d..779ef95c43 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -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);