From b997b8bf14bc4d2a9cadcc4cf70d9612368c0baa Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Mon, 15 Jun 2015 18:10:57 +0100 Subject: [PATCH 1/2] Fix large scenery rotation button missing Button was missing when the large scenery item was in position 0. Missing a compare. Scenery window needs to be refactored at some point. Fixes #1342. --- src/windows/scenery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/scenery.c b/src/windows/scenery.c index a546540d0a..6d67658ad0 100644 --- a/src/windows/scenery.c +++ b/src/windows/scenery.c @@ -923,7 +923,7 @@ void window_scenery_invalidate() window_scenery_widgets[WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type = WWT_FLATBTN; } } - else if (tabSelectedSceneryId > 0x300) { + else if (tabSelectedSceneryId >= 0x300) { window_scenery_widgets[WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type = WWT_FLATBTN; } } From 9886bb5d4861dee7b0f05e0d930ce691a01eace6 Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Mon, 15 Jun 2015 18:33:21 +0100 Subject: [PATCH 2/2] Fix peep rides been on displaying incorrectly. Made a mistake when changing from an array of 32bit values to an array of 8bit values. Fixes #1336. --- src/windows/guest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/windows/guest.c b/src/windows/guest.c index ea4ecb9221..d5b9467b55 100644 --- a/src/windows/guest.c +++ b/src/windows/guest.c @@ -1566,8 +1566,8 @@ void window_guest_rides_update(){ uint8 curr_list_position = 0; for (uint8 ride_id = 0; ride_id < 255; ++ride_id){ // Offset to the ride_id bit in peep_rides_been_on - uint8 ride_id_bit = ride_id & 0x1F; - uint8 ride_id_offset = ride_id / 32; + uint8 ride_id_bit = ride_id & 0x7; + uint8 ride_id_offset = ride_id / 8; if (peep->rides_been_on[ride_id_offset] & (1 << ride_id_bit)){ rct_ride* ride = GET_RIDE(ride_id); if (RCT2_ADDRESS(0x97C3AF, uint8)[ride->type] == 0){