From ddd6b63d09e5c1be5641192bb723c1b2a0691cc3 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Mon, 2 Nov 2015 20:03:06 +0000 Subject: [PATCH] Fix #2173. Entrance fee too high can no longer be a news item if no money is on. This is kind of an original bug because the game doesn't check normally to see if money is on during this. I didn't want to reset the entrance fee as then it would be annoying switching between the two states. The peeps don't pay if no money is on so nothing is lost. --- src/scenario.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scenario.c b/src/scenario.c index ef3db26fa1..4b910753fd 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -505,7 +505,7 @@ void scenario_entrance_fee_too_high_check() int max_fee = totalRideValue + (totalRideValue / 2); uint32 game_flags = RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32), packed_xy; - if ((game_flags & PARK_FLAGS_PARK_OPEN) && park_entrance_fee > max_fee) { + if ((game_flags & PARK_FLAGS_PARK_OPEN) && (!game_flags & PARK_FLAGS_NO_MONEY) && park_entrance_fee > max_fee) { for (int i = 0; RCT2_ADDRESS(RCT2_ADDRESS_PARK_ENTRANCE_X, sint16)[i] != SPRITE_LOCATION_NULL; i++) { x = RCT2_ADDRESS(RCT2_ADDRESS_PARK_ENTRANCE_X, sint16)[i] + 16; y = RCT2_ADDRESS(RCT2_ADDRESS_PARK_ENTRANCE_Y, sint16)[i] + 16;