mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Merge pull request #10567 from duncanspumpkin/ignore_money

Browse Source 
Fix peep choosing to path to shops with NO_MONEY mode
This commit is contained in:
Duncan
2020-01-16 20:30:24 +00:00
committed by GitHub
parent ee09ffadf7 98de6db515
commit 6231d1c3b5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/network/Network.cpp
View File

@@ -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;

5
src/openrct2/peep/Guest.cpp
View File

@@ -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)
{