diff --git a/src/openrct2/windows/dropdown.c b/src/openrct2/windows/dropdown.c index 9ecdfd31ef..e25b6c12a8 100644 --- a/src/openrct2/windows/dropdown.c +++ b/src/openrct2/windows/dropdown.c @@ -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 diff --git a/src/openrct2/windows/dropdown.h b/src/openrct2/windows/dropdown.h index e0160709e2..68898c7911 100644 --- a/src/openrct2/windows/dropdown.h +++ b/src/openrct2/windows/dropdown.h @@ -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;