mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Fix: #16162 Go Kart speeds not correctly randomised (#16165)

Browse Source 
* 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 <m.o.steenbeek@gmail.com>

* Increment network version

* Update replays

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
This commit is contained in:
deurklink
2021-12-11 18:11:23 +01:00
committed by GitHub
parent cec30e093d
commit ceb49e0984
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -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_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip")
set(OBJECTS_SHA1 "c82605035f120188b7334a781a786ced9588e9af") 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_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(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
option(WITH_TESTS "Build tests") option(WITH_TESTS "Build tests")

1
distribution/changelog.txt
View File

@@ -22,6 +22,7 @@
- Fix: [#16063] Object Selection preview for objects with glass is broken. - Fix: [#16063] Object Selection preview for objects with glass is broken.
- Fix: [#16075] Exporting track designs saves scenery in incorrect locations. - Fix: [#16075] Exporting track designs saves scenery in incorrect locations.
- Fix: [#16087] The Looping Roller Coaster booster is now always drawn correctly. - 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) 0.3.5.1 (2021-11-21)
------------------------------------------------------------------------ ------------------------------------------------------------------------

4
openrct2.proj
View File

@@ -48,8 +48,8 @@
<TitleSequencesSha1>304d13a126c15bf2c86ff13b81a2f2cc1856ac8d</TitleSequencesSha1> <TitleSequencesSha1>304d13a126c15bf2c86ff13b81a2f2cc1856ac8d</TitleSequencesSha1>
<ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.2.4/objects.zip</ObjectsUrl> <ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.2.4/objects.zip</ObjectsUrl>
<ObjectsSha1>c82605035f120188b7334a781a786ced9588e9af</ObjectsSha1> <ObjectsSha1>c82605035f120188b7334a781a786ced9588e9af</ObjectsSha1>
<ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.61/replays.zip</ReplaysUrl> <ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.62/replays.zip</ReplaysUrl>
<ReplaysSha1>18BFAD02A453CE0D5926C13A856546ED825AD0F1</ReplaysSha1> <ReplaysSha1>0B234FA152AFA49F5204ADA97CBAAE39A538961B</ReplaysSha1>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

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

@@ -40,7 +40,7 @@
// This string specifies which version of network stream current build uses. // This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within // It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version. // single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "5" #define NETWORK_STREAM_VERSION "6"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr; static Peep* _pickup_peep = nullptr;

2
src/openrct2/ride/Station.cpp
View File

@@ -278,7 +278,7 @@ static void ride_race_init_vehicle_speeds(Ride* ride)
rct_ride_entry* rideEntry = vehicle->GetRideEntry(); 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) if (vehicle->num_peeps != 0)
{ {