mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #206 from AngeloG/formatting 

Consistency in window_dropdown_show_image in relation to 0x009DE518 flags
This commit is contained in:
Ted John 2014-07-14 07:31:18 +01:00
parent 830f881f3c 51d9db9f73
commit 5a6d40b82e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/window_dropdown.c
View File

@ -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();