From 719e23ec3b1882477a37c09b2d5d90026ecbb6e3 Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Thu, 12 Feb 2015 18:58:16 +0000 Subject: [PATCH] Fix bathrooms missing same price everywhere box. Fix #761 --- src/windows/ride.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/windows/ride.c b/src/windows/ride.c index 2508a3c8ed..f9043aeae0 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -5433,23 +5433,23 @@ static void window_ride_income_invalidate() window_ride_income_widgets[WIDX_PRIMARY_PRICE].image = STR_FREE; primaryItem = 31; - if (ride->type != RIDE_TYPE_BATHROOM) { - if ((primaryItem = (sint8)rideEntry->shop_item) != -1) { - window_ride_income_widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WWT_CHECKBOX; - if (primaryItem < 32) { - if (RCT2_GLOBAL(0x01358838, uint32) & (1 << primaryItem)) - w->pressed_widgets |= (1 << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK); + if (ride->type == RIDE_TYPE_BATHROOM || ((primaryItem = (sint8)rideEntry->shop_item) != -1)) { + window_ride_income_widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WWT_CHECKBOX; + if (primaryItem < 32) { + if (RCT2_GLOBAL(0x01358838, uint32) & (1 << primaryItem)) + w->pressed_widgets |= (1 << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK); - if (primaryItem != 31) - window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].image = 1960 + primaryItem; - } else { - primaryItem -= 32; - if (RCT2_GLOBAL(0x0135934C, uint32) & (1 << primaryItem)) - w->pressed_widgets |= (1 << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK); - - window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].image = 2100 + primaryItem; - } + if (primaryItem != 31) + window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].image = 1960 + primaryItem; } + else { + primaryItem -= 32; + if (RCT2_GLOBAL(0x0135934C, uint32) & (1 << primaryItem)) + w->pressed_widgets |= (1 << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK); + + window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].image = 2100 + primaryItem; + } + } // Get secondary item