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

Fix import of ride value (#19541)

Browse Source 
The ride value undefined constant was changed causing all imports of the undefined value to be incorrect. We can fix the broken imports but can't fix the users of the broken value (gParkValue and its history)
This commit is contained in:
Duncan
2023-03-03 08:45:32 +00:00
committed by GitHub
parent dd624f9bff
commit a018cb1ca5
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 "8"
#define NETWORK_STREAM_VERSION "9"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION

22
src/openrct2/park/ParkFile.cpp
View File

@@ -1411,7 +1411,27 @@ namespace OpenRCT2
{
uint16_t tempRideValue{};
cs.ReadWrite(tempRideValue);
ride.value = ToMoney64(tempRideValue);
if (tempRideValue == 0xFFFFU)
{
ride.value = RIDE_VALUE_UNDEFINED;
}
else
{
ride.value = ToMoney64(tempRideValue);
}
}
else if (version == 19)
{
money64 tempRideValue{};
cs.ReadWrite(tempRideValue);
if (tempRideValue == 0xFFFFU)
{
ride.value = RIDE_VALUE_UNDEFINED;
}
else
{
ride.value = tempRideValue;
}
}
else
{

2
src/openrct2/park/ParkFile.h
View File

@@ -9,7 +9,7 @@ struct ObjectRepositoryItem;
namespace OpenRCT2
{
// Current version that is saved.
constexpr uint32_t PARK_FILE_CURRENT_VERSION = 19;
constexpr uint32_t PARK_FILE_CURRENT_VERSION = 20;
// The minimum version that is forwards compatible with the current version.
constexpr uint32_t PARK_FILE_MIN_VERSION = 19;