mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Define DROPDOWN_ITEMS_MAX_SIZE

Browse Source 
This defines the current limitation of dropdown items.
This commit is contained in:
wolfreak99
2017-07-23 02:29:42 -04:00
committed by Michael Steenbeek
parent eb28bba119
commit 32fbf31777
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/windows/dropdown.c
View File

@@ -46,8 +46,8 @@ sint32 _dropdown_item_width;
sint32 _dropdown_item_height;
sint32 gDropdownNumItems;
rct_string_id gDropdownItemsFormat[64];
sint64 gDropdownItemsArgs[64];
rct_string_id gDropdownItemsFormat[DROPDOWN_ITEMS_MAX_SIZE];
sint64 gDropdownItemsArgs[DROPDOWN_ITEMS_MAX_SIZE];
uint64 gDropdownItemsChecked;
uint64 gDropdownItemsDisabled;
bool gDropdownIsColour;
@@ -337,7 +337,7 @@ static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi)
);
} else {
// Text item
if (i < 64) {
if (i < DROPDOWN_ITEMS_MAX_SIZE) {
if (dropdown_is_checked(i)) {
item++;
}
@@ -348,7 +348,7 @@ static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (i == highlightedIndex)
colour = COLOUR_WHITE;
if (dropdown_is_disabled(i))
if (i < 64)
if (i < DROPDOWN_ITEMS_MAX_SIZE)
colour = NOT_TRANSLUCENT(w->colours[0]) | COLOUR_FLAG_INSET;
// Draw item string

5
src/openrct2/windows/dropdown.h
View File

@@ -23,6 +23,7 @@
#define DROPDOWN_SEPARATOR 0
#define DROPDOWN_FORMAT_COLOUR_PICKER 0xFFFE
#define DROPDOWN_FORMAT_LAND_PICKER 0xFFFF
#define DROPDOWN_ITEMS_MAX_SIZE 64
enum
{
@@ -33,8 +34,8 @@ enum
extern sint32 gAppropriateImageDropdownItemsPerRow[];
extern sint32 gDropdownNumItems;
extern rct_string_id gDropdownItemsFormat[64];
extern sint64 gDropdownItemsArgs[64];
extern rct_string_id gDropdownItemsFormat[DROPDOWN_ITEMS_MAX_SIZE];
extern sint64 gDropdownItemsArgs[DROPDOWN_ITEMS_MAX_SIZE];
extern uint64 gDropdownItemsChecked;
extern uint64 gDropdownItemsDisabled;
extern bool gDropdownIsColour;