From 0393faac44014724a484e3294d0746954e292c1d Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 17 Jan 2025 19:32:55 +0100 Subject: [PATCH] Update error message --- data/language/en-GB.txt | 2 +- src/openrct2/localisation/StringIds.h | 2 +- src/openrct2/ride/Ride.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 5ad819fc9c2e..909181fc5ad1 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -2169,7 +2169,6 @@ STR_3136 :Warning: This design will be built with an alternative vehicle type STR_3137 :Select Nearby Scenery STR_3138 :Reset Selection STR_3139 :Cable lift unable to work in this operating mode -STR_3140 :Cable lift hill must start immediately after station STR_3141 :Multi-circuit per ride not possible with cable lift hill STR_3142 :{WINDOW_COLOUR_2}Capacity: {BLACK}{STRINGID} STR_3143 :Show people on map @@ -3792,3 +3791,4 @@ STR_6725 :X: STR_6726 :Y: STR_6727 :Dive Loop (left) STR_6728 :Dive Loop (right) +STR_6729 :Cable lift hill must start immediately after station or block brake diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index d2f48602e5fc..eca57ead666b 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -1187,7 +1187,7 @@ enum : StringId STR_CANT_REPAINT_THIS = 3103, STR_ERR_UNABLE_TO_BUILD_THIS_ON_SLOPE = 3133, STR_CABLE_LIFT_UNABLE_TO_WORK_IN_THIS_OPERATING_MODE = 3139, - STR_CABLE_LIFT_HILL_MUST_START_IMMEDIATELY_AFTER_STATION = 3140, + STR_CABLE_LIFT_HILL_MUST_START_IMMEDIATELY_AFTER_STATION_OR_BLOCK_BRAKE = 6729, STR_MULTICIRCUIT_NOT_POSSIBLE_WITH_CABLE_LIFT_HILL = 3141, STR_SELECT_NUMBER_OF_CIRCUITS_TIP = 3160, diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 1b5a81a25d92..a376e5443fa3 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -3785,7 +3785,7 @@ static ResultWithMessage RideInitialiseCableLiftTrack(const Ride& ride, bool isA // Despawn existing cable lift tiles CoordsXYE stationTile; if (!RideGetStationTile(ride, &stationTile)) - return { false, STR_CABLE_LIFT_HILL_MUST_START_IMMEDIATELY_AFTER_STATION }; + return { false, STR_CABLE_LIFT_HILL_MUST_START_IMMEDIATELY_AFTER_STATION_OR_BLOCK_BRAKE }; if (isApplying) { @@ -3837,10 +3837,10 @@ static ResultWithMessage RideInitialiseCableLiftTrack(const Ride& ride, bool isA case TrackElemType::BlockBrakes: return { true }; default: - return { false, STR_CABLE_LIFT_HILL_MUST_START_IMMEDIATELY_AFTER_STATION }; + return { false, STR_CABLE_LIFT_HILL_MUST_START_IMMEDIATELY_AFTER_STATION_OR_BLOCK_BRAKE }; } } - return { false, STR_CABLE_LIFT_HILL_MUST_START_IMMEDIATELY_AFTER_STATION }; + return { false, STR_CABLE_LIFT_HILL_MUST_START_IMMEDIATELY_AFTER_STATION_OR_BLOCK_BRAKE }; } /**