mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix parameter validation for cheat action (#20512) 

* Fix parameter validation for cheat action

* Bump up network version

* Add enumeration for Count

* Add missing enumeration to switch
This commit is contained in:
Matthias Moninger 2023-07-03 02:00:31 +03:00 committed by GitHub
parent d5319eeb89
commit 329b4d42ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/Cheats.cpp
View File

@ -792,7 +792,7 @@ private:
CheatsSet(CheatType::SetMoney, _moneySpinnerValue);
break;
case WIDX_CLEAR_LOAN:
CheatsSet(CheatType::ClearLoan, CHEATS_MONEY_DEFAULT);
CheatsSet(CheatType::ClearLoan);
break;
}
}

45
src/openrct2/actions/CheatSetAction.cpp
View File

@ -315,6 +315,14 @@ ParametersRange CheatSetAction::GetParameterRange(CheatType cheatType) const
[[fallthrough]];
case CheatType::AllowRegularPathAsQueue:
[[fallthrough]];
case CheatType::UnlockAllPrices:
[[fallthrough]];
case CheatType::MakeDestructible:
[[fallthrough]];
case CheatType::AllowSpecialColourSchemes:
[[fallthrough]];
case CheatType::AllowTrackPlaceInvalidHeights:
[[fallthrough]];
case CheatType::OpenClosePark:
return { { 0, 1 }, { 0, 0 } };
case CheatType::AddMoney:
@ -357,12 +365,45 @@ ParametersRange CheatSetAction::GetParameterRange(CheatType cheatType) const
case CheatType::ForceWeather:
return { { 0, EnumValue(WeatherType::Count) - 1 }, { 0, 0 } };
case CheatType::SetForcedParkRating:
return { { 0, 999 }, { 0, 0 } };
return { { -1, 999 }, { 0, 0 } };
case CheatType::CreateDucks:
return { { 0, 100 }, { 0, 0 } };
default:
case CheatType::RemoveDucks:
[[fallthrough]];
case CheatType::ClearLoan:
[[fallthrough]];
case CheatType::RemoveAllGuests:
[[fallthrough]];
case CheatType::OwnAllLand:
[[fallthrough]];
case CheatType::WinScenario:
[[fallthrough]];
case CheatType::HaveFun:
[[fallthrough]];
case CheatType::FixVandalism:
[[fallthrough]];
case CheatType::WaterPlants:
[[fallthrough]];
case CheatType::FixRides:
[[fallthrough]];
case CheatType::RenewRides:
[[fallthrough]];
case CheatType::TenMinuteInspections:
[[fallthrough]];
case CheatType::ResetCrashStatus:
[[fallthrough]];
case CheatType::NoCapOnQueueLengthDummy:
[[fallthrough]];
case CheatType::RemoveLitter:
return { { 0, 0 }, { 0, 0 } };
case CheatType::Count:
break;
}
// Should be unreachable unless new cheats are added, still have to return something
// to avoid compiler warnings.
Guard::Assert(false, "Missing validation parameter for cheat: %d", _cheatType.id);
return { { 0, 0 }, { 0, 0 } };
}
void CheatSetAction::SetGrassLength(int32_t length) const

2
src/openrct2/network/NetworkBase.cpp
View File

@ -43,7 +43,7 @@
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "11"
#define NETWORK_STREAM_VERSION "12"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION