From 3f108114268f35f2e2234ea1a0eea317bff06e2b Mon Sep 17 00:00:00 2001 From: aw20368 Date: Sat, 14 Sep 2019 09:06:16 -0400 Subject: [PATCH 1/2] Fix #9970: Wait for quarter load fails Vehicle was always incorrectly flagged as ready to depart when quarter load is selected. Removed erroneous flag. --- src/openrct2/ride/Vehicle.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 26c85c421917..990c3c3430a2 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -2406,7 +2406,6 @@ static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle) if (load == 0) { - vehicle->update_flags |= VEHICLE_UPDATE_FLAG_TRAIN_READY_DEPART; train_ready_to_depart(vehicle, num_peeps_on_train, num_used_seats_on_train); return; } From 856075a78100da079b3fcdd33d9d710fdba7105d Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 22 Sep 2019 23:07:57 +0200 Subject: [PATCH 2/2] Bump network version and amend changelog --- distribution/changelog.txt | 1 + src/openrct2/network/Network.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 0beacbe8d51c..5c6df67d4eac 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -21,6 +21,7 @@ - Fix: [#9902] Doors/Portcullis do not check to make sure doors are open causing double opens. - Fix: [#9926] Africa - Oasis park has wrong peep spawn (original bug). - Fix: [#9957] When using 'no money' cheat, guests complain of running out of cash. +- Fix: [#9970] Wait for quarter load fails. - Improved: [#9466] Add the rain weather effect to the OpenGL renderer. 0.2.3 (2019-07-10) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 4a3070f5d48c..43a01417b698 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -34,7 +34,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 "13" +#define NETWORK_STREAM_VERSION "14" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;