From 51d9db9f7350a2c1d99e9d0fa0ec77a0660d5134 Mon Sep 17 00:00:00 2001 From: Angelo Geels Date: Sun, 13 Jul 2014 13:11:38 +0200 Subject: [PATCH] Consistency in window_dropdown_show_image in relation to 0x009DE518 flags --- src/window_dropdown.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/window_dropdown.c b/src/window_dropdown.c index f9b609d453..905fc33951 100644 --- a/src/window_dropdown.c +++ b/src/window_dropdown.c @@ -137,9 +137,9 @@ void window_dropdown_show_text_custom_width(int x, int y, int extray, uint8 colo memcpy((void*)0x009DEBA4, gDropdownItemsFormat, 40 * 2); memcpy((void*)0x009DEBF4, gDropdownItemsArgs, 40 * 8); - RCT2_GLOBAL(0x009DE518, uint32) &= ~(0x04 | 0x02); + RCT2_GLOBAL(0x009DE518, uint32) &= ~((1 << 2) | (1 << 1)); if (flags & 0x80) - RCT2_GLOBAL(0x009DE518, uint32) |= 0x02; + RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 1); window_dropdown_close(); _dropdown_num_columns = 1; @@ -206,9 +206,9 @@ void window_dropdown_show_image(int x, int y, int extray, uint8 colour, uint8 fl memcpy((void*)0x009DEBA4, gDropdownItemsFormat, 40 * 2); memcpy((void*)0x009DEBF4, gDropdownItemsArgs, 40 * 8); - RCT2_GLOBAL(0x009DE518, uint32) &= ~(0x04 | 0x02); + RCT2_GLOBAL(0x009DE518, uint32) &= ~((1 << 2) | (1 << 1)); if (flags & 0x80) - RCT2_GLOBAL(0x009DE518, uint32) |= 0x02; + RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 1); // Close existing dropdown window_dropdown_close();