From f04e791f7c8d3253584fe0dbfca46e11ebe795ca Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Mon, 13 Jan 2020 19:20:35 +0000 Subject: [PATCH 1/2] When in NO_MONEY mode still path to shops with prices --- src/openrct2/peep/Guest.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index e77d6c61a8..9cfc725bb0 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -2272,7 +2272,7 @@ bool Guest::ShouldGoToShop(Ride* ride, bool peepAtShop) // The amount that peeps are willing to pay to use the Toilets scales with their bathroom stat. // It effectively has a minimum of $0.10 (due to the check above) and a maximum of $0.60. - if (ride->price * 40 > toilet) + if (ride_get_price(ride) * 40 > toilet) { if (peepAtShop) { @@ -2298,7 +2298,8 @@ bool Guest::ShouldGoToShop(Ride* ride, bool peepAtShop) } // Basic price checks - if (ride->price != 0 && ride->price > cash_in_pocket) + auto ridePrice = ride_get_price(ride); + if (ridePrice != 0 && ridePrice > cash_in_pocket) { if (peepAtShop) { From 98de6db5156058027c9a1698bc57cc3f0bc6b69b Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Mon, 13 Jan 2020 19:21:08 +0000 Subject: [PATCH 2/2] Increment network version --- src/openrct2/network/Network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 755e881247..331552aa88 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 "8" +#define NETWORK_STREAM_VERSION "9" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;