diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index a808a5598e..b82182689f 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -340,7 +340,6 @@ STR_0950 :Load Game STR_0951 :Quit Game STR_0952 :Quit Game STR_0953 :Load Landscape -STR_0954 : STR_0955 :Select seat rotation angle for this track section STR_0956 :-180° STR_0957 :-135° @@ -3618,6 +3617,7 @@ STR_6510 :Zero G Roll (left) STR_6511 :Zero G Roll (right) STR_6512 :Large Zero G Roll (left) STR_6513 :Large Zero G Roll (right) +STR_6514 :Invalid height! ############# # Scenarios # diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 9bcd94cf3a..37281079b1 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -30,6 +30,7 @@ - Fix: [#17600] Notifications are not properly cleared when loading a park. - Fix: [#17605] Crash when opening parks which have had objects removed externally. - Fix: [#17639] When building upside down, the special elements list contains many items twice (original bug). +- Fix: [#17703] (undefined string) when building on invalid height. 0.4.1 (2022-07-04) ------------------------------------------------------------------------ diff --git a/src/openrct2/actions/MazePlaceTrackAction.cpp b/src/openrct2/actions/MazePlaceTrackAction.cpp index 0f318a7a1c..9c701a6bb9 100644 --- a/src/openrct2/actions/MazePlaceTrackAction.cpp +++ b/src/openrct2/actions/MazePlaceTrackAction.cpp @@ -45,7 +45,7 @@ GameActions::Result MazePlaceTrackAction::Query() const if ((_loc.z & 0xF) != 0) { res.Error = GameActions::Status::Unknown; - res.ErrorMessage = STR_CONSTRUCTION_ERR_UNKNOWN; + res.ErrorMessage = STR_INVALID_HEIGHT; return res; } diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp index 88e0631757..d9b1f96a2f 100644 --- a/src/openrct2/actions/MazeSetTrackAction.cpp +++ b/src/openrct2/actions/MazeSetTrackAction.cpp @@ -56,7 +56,7 @@ GameActions::Result MazeSetTrackAction::Query() const if ((_loc.z & 0xF) != 0 && _mode == GC_SET_MAZE_TRACK_BUILD) { res.Error = GameActions::Status::Unknown; - res.ErrorMessage = STR_CONSTRUCTION_ERR_UNKNOWN; + res.ErrorMessage = STR_INVALID_HEIGHT; return res; } diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index a39a80a00e..4281fc811f 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -194,8 +194,7 @@ GameActions::Result TrackPlaceAction::Query() const if ((_origin.z & 0x0F) != 8) { return GameActions::Result( - GameActions::Status::InvalidParameters, STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE, - STR_CONSTRUCTION_ERR_UNKNOWN); + GameActions::Status::InvalidParameters, STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE, STR_INVALID_HEIGHT); } } else @@ -203,8 +202,7 @@ GameActions::Result TrackPlaceAction::Query() const if ((_origin.z & 0x0F) != 0) { return GameActions::Result( - GameActions::Status::InvalidParameters, STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE, - STR_CONSTRUCTION_ERR_UNKNOWN); + GameActions::Status::InvalidParameters, STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE, STR_INVALID_HEIGHT); } } } diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index a5d20cf53c..28461084de 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -372,7 +372,7 @@ enum : uint16_t STR_QUIT_GAME_PROMPT_TITLE = 951, STR_QUIT_GAME_2_PROMPT_TITLE = 952, STR_LOAD_LANDSCAPE_PROMPT_TITLE = 953, - STR_CONSTRUCTION_ERR_UNKNOWN = 954, + STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP = 955, STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_180 = 956, STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_135 = 957, @@ -3897,6 +3897,8 @@ enum : uint16_t STR_LARGE_ZERO_G_ROLL_LEFT = 6512, STR_LARGE_ZERO_G_ROLL_RIGHT = 6513, + STR_INVALID_HEIGHT = 6514, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working /* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings };