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

Merge pull request #19587 from ZehMatt/fix-19586 

Fix some issues regarding money64 change
This commit is contained in:
Matthias Moninger 2023-03-09 00:47:12 +02:00 committed by GitHub
parent cdb2c39d46 b2efb3a6f7
commit 68b92ba7d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -76,9 +76,9 @@ set(OPENMSX_VERSION "1.0.1")
set(OPENMSX_URL "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip")
set(OPENMSX_SHA1 "8ff94490180e2fbfdd13a4130eb300da726ca406")
set(REPLAYS_VERSION "0.0.74")
set(REPLAYS_VERSION "0.0.75")
set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip")
set(REPLAYS_SHA1 "7AB14AB3B991BA4214E53BB0B0838D254C1E7BA6")
set(REPLAYS_SHA1 "D1701450AE0FE84B144236243A925801B67D92ED")
option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
option(WITH_TESTS "Build tests")

4
openrct2.proj
View File

@ -51,8 +51,8 @@
<OpenSFXSha1>8f04aea33f8034131c3069f6accacce0d94f80c1</OpenSFXSha1>
<OpenMSXUrl>https://github.com/OpenRCT2/OpenMusic/releases/download/v1.0.1/openmusic.zip</OpenMSXUrl>
<OpenMSXSha1>8ff94490180e2fbfdd13a4130eb300da726ca406</OpenMSXSha1>
<ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.74/replays.zip</ReplaysUrl>
<ReplaysSha1>7AB14AB3B991BA4214E53BB0B0838D254C1E7BA6</ReplaysSha1>
<ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.75/replays.zip</ReplaysUrl>
<ReplaysSha1>D1701450AE0FE84B144236243A925801B67D92ED</ReplaysSha1>
</PropertyGroup>
<ItemGroup>

2
src/openrct2/entity/Guest.cpp
View File

@ -7130,7 +7130,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords)
peep->PeepId = gNextGuestNumber++;
peep->Name = nullptr;
money64 cash = (ScenarioRand() & 0x3) * 100 - 100 + gGuestInitialCash;
money64 cash = (static_cast<money64>(ScenarioRand() & 0x3) * 100) - 100 + gGuestInitialCash;
if (cash < 0)
cash = 0;

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 "10"
#define NETWORK_STREAM_VERSION "11"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION