From 487fcc3c5b1376c19c8c54d060fee75d3bc0c812 Mon Sep 17 00:00:00 2001 From: Ted John Date: Tue, 19 Jul 2016 18:35:44 +0100 Subject: [PATCH] Fix #4134: Can't enable park-wide photo price for log flume and river ra Caused by not shifting the shop item flags (those above 32) to the correct mask bit. --- distribution/changelog.txt | 1 + src/windows/ride.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 08a630a481..91d0a3d081 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -111,6 +111,7 @@ - Fix: [#3015] Walls in SC4/SV4 files are not imported correctly. - Fix: [#3063] Search exe directory for SSL bundle as well as CWD. - Fix: [#3120] Negative cash in finance window is not red. +- Fix: [#4134] Can't enable park-wide photo price for log flume and river rapids. 0.0.3.1-beta (2015-12-04) ------------------------------------------------------------------------ diff --git a/src/windows/ride.c b/src/windows/ride.c index 62f01ee324..23c13d9a45 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -5641,7 +5641,9 @@ static void update_same_price_throughout_flags(uint32 shop_item) game_do_command(0, 1, 0, (0x2 << 8), GAME_COMMAND_SET_PARK_OPEN, newFlags, shop_item); newFlags = gSamePriceThroughoutParkB; - newFlags ^= (SHOP_ITEM_PHOTO2 - 32) | (SHOP_ITEM_PHOTO3 - 32) | (SHOP_ITEM_PHOTO4 - 32); + newFlags ^= (1 << (SHOP_ITEM_PHOTO2 - 32)) | + (1 << (SHOP_ITEM_PHOTO3 - 32)) | + (1 << (SHOP_ITEM_PHOTO4 - 32)); game_do_command(0, 1, 0, (0x3 << 8), GAME_COMMAND_SET_PARK_OPEN, newFlags, shop_item); } else {