Merge pull request #11317 from Gymnasiast/fix/11315

Fix #11315: Never opened ride shown as favourite ride of 74 guests

CMakeLists.txt

@@ -27,8 +27,8 @@ set(TITLE_SEQUENCE_SHA1 "304d13a126c15bf2c86ff13b81a2f2cc1856ac8d")
 set(OBJECTS_URL  "https://github.com/OpenRCT2/objects/releases/download/v1.0.14/objects.zip")
 set(OBJECTS_SHA1 "31a0ed0047b4bdb1428071044130192b3c0a30fa")
 
-set(REPLAYS_URL  "https://github.com/OpenRCT2/replays/releases/download/v0.0.9/replays.zip")
-set(REPLAYS_SHA1 "4A2CAE6C6DBD54E8C0A892AA6327540F6F5108B1")
+set(REPLAYS_URL  "https://github.com/OpenRCT2/replays/releases/download/v0.0.10/replays.zip")
+set(REPLAYS_SHA1 "031DE3EEB1515881158517CDC3B926FF810D0249")
 
 option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
 option(WITH_TESTS "Build tests")

distribution/changelog.txt

@@ -2,6 +2,7 @@
 ------------------------------------------------------------------------
 - Feature: [#11231] Change shortcut window list order to be more intuitive, and split it into logical sections.
 - Fix: [#11072] Land and water tools working out of bounds (original bug).
+- Fix: [#11315] Ride that has never opened is shown as favorite ride of many guests.
 
 0.2.6 (2020-04-17)
 ------------------------------------------------------------------------

openrct2.proj

@@ -48,8 +48,8 @@
     <TitleSequencesSha1>304d13a126c15bf2c86ff13b81a2f2cc1856ac8d</TitleSequencesSha1>
     <ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.0.14/objects.zip</ObjectsUrl>
     <ObjectsSha1>31a0ed0047b4bdb1428071044130192b3c0a30fa</ObjectsSha1>
-    <ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.9/replays.zip</ReplaysUrl>
-    <ReplaysSha1>4A2CAE6C6DBD54E8C0A892AA6327540F6F5108B1</ReplaysSha1>
+    <ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.10/replays.zip</ReplaysUrl>
+    <ReplaysSha1>031DE3EEB1515881158517CDC3B926FF810D0249</ReplaysSha1>
   </PropertyGroup>
 
   <ItemGroup>

src/openrct2/actions/StaffHireNewAction.hpp

@@ -175,6 +175,7 @@ private:
             newPeep->paid_on_rides = 0;
             newPeep->paid_on_food = 0;
             newPeep->paid_on_souvenirs = 0;
+            newPeep->favourite_ride = RIDE_ID_NULL;
             newPeep->staff_orders = _staffOrders;
 
             uint16_t idSearchSpriteIndex;

src/openrct2/network/Network.cpp

@@ -31,7 +31,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 "0"
+#define NETWORK_STREAM_VERSION "1"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 static Peep* _pickup_peep = nullptr;

src/openrct2/ride/Ride.cpp

@@ -322,7 +322,7 @@ void ride_update_favourited_stat()
     for (auto& ride : GetRideManager())
         ride.guests_favourite = 0;
 
-    FOR_ALL_PEEPS (spriteIndex, peep)
+    FOR_ALL_GUESTS (spriteIndex, peep)
     {
         if (peep->linked_list_index != SPRITE_LIST_PEEP)
             return;