Merge pull request #10011 from Gymnasiast/fix/9970-b

Cherry-pick fix from #9987
OpenRCT2 · Sep 22, 2019 · 48edea2 · 48edea2
2 parents 5e1d14f + 856075a
commit 48edea2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;

diff --git 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;
             }