mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #8642: Likely mistake in entrance fee check

This commit is contained in:
Tom Lankhorst 2019-01-28 11:15:49 +01:00 committed by Michael Steenbeek
parent 4c015edaf6
commit 0233795add
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/management/Marketing.cpp
View File

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

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

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