diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ce60836d5..fb8919b507 100644 --- a/CMakeLists.txt +++ b/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") diff --git a/distribution/changelog.txt b/distribution/changelog.txt index c4fe6371e9..968007e7fd 100644 --- a/distribution/changelog.txt +++ b/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) ------------------------------------------------------------------------ diff --git a/openrct2.proj b/openrct2.proj index 8e3bd8e55e..6002ec2d69 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -48,8 +48,8 @@ 304d13a126c15bf2c86ff13b81a2f2cc1856ac8d https://github.com/OpenRCT2/objects/releases/download/v1.0.14/objects.zip 31a0ed0047b4bdb1428071044130192b3c0a30fa - https://github.com/OpenRCT2/replays/releases/download/v0.0.9/replays.zip - 4A2CAE6C6DBD54E8C0A892AA6327540F6F5108B1 + https://github.com/OpenRCT2/replays/releases/download/v0.0.10/replays.zip + 031DE3EEB1515881158517CDC3B926FF810D0249 diff --git a/src/openrct2/actions/StaffHireNewAction.hpp b/src/openrct2/actions/StaffHireNewAction.hpp index 53a5c174f2..497af4f4a8 100644 --- a/src/openrct2/actions/StaffHireNewAction.hpp +++ b/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; diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index eb373535d2..9322a37655 100644 --- a/src/openrct2/network/Network.cpp +++ b/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; diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index d9dc16c85a..59f81857a9 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/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;