From 0233795add712d9bb1b79d7085f723a6289a7168 Mon Sep 17 00:00:00 2001 From: Tom Lankhorst Date: Mon, 28 Jan 2019 11:15:49 +0100 Subject: [PATCH] Fix #8642: Likely mistake in entrance fee check --- src/openrct2/management/Marketing.cpp | 6 +++--- src/openrct2/network/Network.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index 541c9355c4..b8a0645b1f 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -46,16 +46,16 @@ int32_t marketing_get_campaign_guest_generation_probability(int32_t campaign) switch (campaign) { case ADVERTISING_CAMPAIGN_PARK_ENTRY_FREE: - if (park_get_entrance_fee() < 4) + if (park_get_entrance_fee() < MONEY(4, 00)) probability /= 8; break; case ADVERTISING_CAMPAIGN_PARK_ENTRY_HALF_PRICE: - if (park_get_entrance_fee() < 6) + if (park_get_entrance_fee() < MONEY(6, 00)) probability /= 8; break; case ADVERTISING_CAMPAIGN_RIDE_FREE: ride = get_ride(gMarketingCampaignRideIndex[campaign]); - if (ride->price < 3) + if (ride->price < MONEY(0, 30)) probability /= 8; break; } diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 806997a167..a22858af7d 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -30,7 +30,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 "24" +#define NETWORK_STREAM_VERSION "25" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static rct_peep* _pickup_peep = nullptr;