From ceb49e098409c2c770359eab7d22f7fc5c738d5e Mon Sep 17 00:00:00 2001 From: deurklink Date: Sat, 11 Dec 2021 18:11:23 +0100 Subject: [PATCH] Fix: #16162 Go Kart speeds not correctly randomised (#16165) * Fix Go Kart Speeds not being random Go kart speeds now only get 2 different values (around 37kmh or around 25kmh), in vanilla Go karts can also have a value in between. This PR fixes that. * Update changelog.txt Co-authored-by: Michael Steenbeek * Increment network version * Update replays Co-authored-by: Michael Steenbeek Co-authored-by: duncanspumpkin --- CMakeLists.txt | 4 ++-- distribution/changelog.txt | 1 + openrct2.proj | 4 ++-- src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/ride/Station.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f2345bbc6..8d202cf5a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,9 +65,9 @@ set(OBJECTS_VERSION "1.2.4") set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip") set(OBJECTS_SHA1 "c82605035f120188b7334a781a786ced9588e9af") -set(REPLAYS_VERSION "0.0.61") +set(REPLAYS_VERSION "0.0.62") set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip") -set(REPLAYS_SHA1 "18BFAD02A453CE0D5926C13A856546ED825AD0F1") +set(REPLAYS_SHA1 "0B234FA152AFA49F5204ADA97CBAAE39A538961B") option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.") option(WITH_TESTS "Build tests") diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e1edb0db85..9ce4330b37 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -22,6 +22,7 @@ - Fix: [#16063] Object Selection preview for objects with glass is broken. - Fix: [#16075] Exporting track designs saves scenery in incorrect locations. - Fix: [#16087] The Looping Roller Coaster booster is now always drawn correctly. +- Fix: [#16162] Go Karts speeds are not correctly randomised, they only go very fast or very slow. 0.3.5.1 (2021-11-21) ------------------------------------------------------------------------ diff --git a/openrct2.proj b/openrct2.proj index 9cc44cc738..647db8e5a5 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -48,8 +48,8 @@ 304d13a126c15bf2c86ff13b81a2f2cc1856ac8d https://github.com/OpenRCT2/objects/releases/download/v1.2.4/objects.zip c82605035f120188b7334a781a786ced9588e9af - https://github.com/OpenRCT2/replays/releases/download/v0.0.61/replays.zip - 18BFAD02A453CE0D5926C13A856546ED825AD0F1 + https://github.com/OpenRCT2/replays/releases/download/v0.0.62/replays.zip + 0B234FA152AFA49F5204ADA97CBAAE39A538961B diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 423d455d71..6a78d00613 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -40,7 +40,7 @@ // This string specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "5" +#define NETWORK_STREAM_VERSION "6" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr; diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index efc02be01b..750cc48727 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -278,7 +278,7 @@ static void ride_race_init_vehicle_speeds(Ride* ride) rct_ride_entry* rideEntry = vehicle->GetRideEntry(); - vehicle->speed = (scenario_rand() & 16) - 8 + rideEntry->vehicles[vehicle->vehicle_type].powered_max_speed; + vehicle->speed = (scenario_rand() & 15) - 8 + rideEntry->vehicles[vehicle->vehicle_type].powered_max_speed; if (vehicle->num_peeps != 0) {