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

Fix #18364: No Too High! or Too Low! error messages when attempting to raise/lower land beyond the limits

Browse Source
This commit is contained in:
HouseholdVTuber
2022-12-06 21:06:06 -05:00
committed by GitHub
parent 84b3fc9da4
commit 228a8573e2
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contributors.md
View File

@@ -203,6 +203,8 @@ The following people are not part of the development team, but have been contrib
* Raymond Zhao (rzhao271)
* Xixiang Chen (jacknull1991)
* (ReticulatingSplines)
* Conrad Cash (HouseholdVTuber)
## Toolchain
* (Balletie) - macOS
@@ -269,4 +271,4 @@ Representation by Jacqui Lyons at Marjacq Ltd.
Thanks to: Peter James Adcock, Joe Booth, and John Wardley
Licensed to Infogrames Interactive Inc.
Licensed to Infogrames Interactive Inc.

12
src/openrct2/actions/LandSetHeightAction.cpp
View File

@@ -52,10 +52,10 @@ GameActions::Result LandSetHeightAction::Query() const
return GameActions::Result(GameActions::Status::Disallowed, STR_FORBIDDEN_BY_THE_LOCAL_AUTHORITY, STR_NONE);
}
StringId errorTitle = CheckParameters();
if (errorTitle != STR_NONE)
StringId errorMessage = CheckParameters();
if (errorMessage != STR_NONE)
{
return GameActions::Result(GameActions::Status::Disallowed, errorTitle, STR_NONE);
return GameActions::Result(GameActions::Status::Disallowed, STR_NONE, errorMessage);
}
if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gCheatsSandboxMode)
@@ -86,10 +86,10 @@ GameActions::Result LandSetHeightAction::Query() const
// Check for ride support limits
if (!gCheatsDisableSupportLimits)
{
errorTitle = CheckRideSupports();
if (errorTitle != STR_NONE)
errorMessage = CheckRideSupports();
if (errorMessage != STR_NONE)
{
return GameActions::Result(GameActions::Status::Disallowed, errorTitle, STR_NONE);
return GameActions::Result(GameActions::Status::Disallowed, STR_NONE, errorMessage);
}
}