mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix #17703: (undefined string) when building on invalid height

Browse Source
This commit is contained in:
Michael Steenbeek
2022-08-06 15:42:51 +02:00
committed by GitHub
parent 863892391d
commit 746722df1b
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/language/en-GB.txt
View File

@@ -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 #

1
distribution/changelog.txt
View File

@@ -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)
------------------------------------------------------------------------

2
src/openrct2/actions/MazePlaceTrackAction.cpp
View File

@@ -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;
}

2
src/openrct2/actions/MazeSetTrackAction.cpp
View File

@@ -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;
}

6
src/openrct2/actions/TrackPlaceAction.cpp
View File

@@ -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);
}
}
}

4
src/openrct2/localisation/StringIds.h
View File

@@ -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
};