mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fixed drop downs not staying open and music dropdown not working first time after game opened.
This commit is contained in:
parent
d9cd873ad7
commit
1b269675d8
|
@ -1697,7 +1697,7 @@ static void window_ride_show_view_dropdown(rct_window *w, rct_widget *widget)
|
||||||
w->y + dropdownWidget->top,
|
w->y + dropdownWidget->top,
|
||||||
dropdownWidget->bottom - dropdownWidget->top + 1,
|
dropdownWidget->bottom - dropdownWidget->top + 1,
|
||||||
w->colours[1],
|
w->colours[1],
|
||||||
0,
|
0x80,
|
||||||
numItems,
|
numItems,
|
||||||
widget->right - dropdownWidget->left
|
widget->right - dropdownWidget->left
|
||||||
);
|
);
|
||||||
|
@ -2759,7 +2759,7 @@ static void window_ride_mode_dropdown(rct_window *w, rct_widget *widget)
|
||||||
w->y + dropdownWidget->top,
|
w->y + dropdownWidget->top,
|
||||||
dropdownWidget->bottom - dropdownWidget->top + 1,
|
dropdownWidget->bottom - dropdownWidget->top + 1,
|
||||||
w->colours[1],
|
w->colours[1],
|
||||||
0,
|
0x80,
|
||||||
numAvailableModes,
|
numAvailableModes,
|
||||||
widget->right - dropdownWidget->left
|
widget->right - dropdownWidget->left
|
||||||
);
|
);
|
||||||
|
@ -2791,7 +2791,7 @@ static void window_ride_load_dropdown(rct_window *w, rct_widget *widget)
|
||||||
w->y + dropdownWidget->top,
|
w->y + dropdownWidget->top,
|
||||||
dropdownWidget->bottom - dropdownWidget->top + 1,
|
dropdownWidget->bottom - dropdownWidget->top + 1,
|
||||||
w->colours[1],
|
w->colours[1],
|
||||||
0,
|
0x80,
|
||||||
5,
|
5,
|
||||||
widget->right - dropdownWidget->left
|
widget->right - dropdownWidget->left
|
||||||
);
|
);
|
||||||
|
@ -3323,7 +3323,7 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc
|
||||||
w->y + dropdownWidget->top,
|
w->y + dropdownWidget->top,
|
||||||
dropdownWidget->bottom - dropdownWidget->top + 1,
|
dropdownWidget->bottom - dropdownWidget->top + 1,
|
||||||
w->colours[1],
|
w->colours[1],
|
||||||
0,
|
0x80,
|
||||||
7,
|
7,
|
||||||
widget->right - dropdownWidget->left
|
widget->right - dropdownWidget->left
|
||||||
);
|
);
|
||||||
|
@ -3676,7 +3676,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid
|
||||||
w->y + dropdownWidget->top,
|
w->y + dropdownWidget->top,
|
||||||
dropdownWidget->bottom - dropdownWidget->top + 1,
|
dropdownWidget->bottom - dropdownWidget->top + 1,
|
||||||
w->colours[1],
|
w->colours[1],
|
||||||
0,
|
0x80,
|
||||||
4,
|
4,
|
||||||
widget->right - dropdownWidget->left
|
widget->right - dropdownWidget->left
|
||||||
);
|
);
|
||||||
|
@ -3703,7 +3703,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid
|
||||||
w->y + dropdownWidget->top,
|
w->y + dropdownWidget->top,
|
||||||
dropdownWidget->bottom - dropdownWidget->top + 1,
|
dropdownWidget->bottom - dropdownWidget->top + 1,
|
||||||
w->colours[1],
|
w->colours[1],
|
||||||
0,
|
0x80,
|
||||||
4,
|
4,
|
||||||
widget->right - dropdownWidget->left
|
widget->right - dropdownWidget->left
|
||||||
);
|
);
|
||||||
|
@ -3743,7 +3743,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid
|
||||||
w->y + dropdownWidget->top,
|
w->y + dropdownWidget->top,
|
||||||
dropdownWidget->bottom - dropdownWidget->top + 1,
|
dropdownWidget->bottom - dropdownWidget->top + 1,
|
||||||
w->colours[1],
|
w->colours[1],
|
||||||
0,
|
0x80,
|
||||||
rideEntry->max_cars_in_train > 1 ? 3 : 2,
|
rideEntry->max_cars_in_train > 1 ? 3 : 2,
|
||||||
widget->right - dropdownWidget->left
|
widget->right - dropdownWidget->left
|
||||||
);
|
);
|
||||||
|
@ -4327,21 +4327,24 @@ static void window_ride_music_mousedown(int widgetIndex, rct_window *w, rct_widg
|
||||||
window_ride_current_music_style_order[numItems++] = MUSIC_STYLE_CUSTOM_MUSIC_2;
|
window_ride_current_music_style_order[numItems++] = MUSIC_STYLE_CUSTOM_MUSIC_2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < numItems; i++) {
|
||||||
|
gDropdownItemsFormat[i] = 1142;
|
||||||
|
gDropdownItemsArgs[i] = STR_MUSIC_STYLE_START + window_ride_current_music_style_order[i];
|
||||||
|
}
|
||||||
|
|
||||||
window_dropdown_show_text_custom_width(
|
window_dropdown_show_text_custom_width(
|
||||||
w->x + dropdownWidget->left,
|
w->x + dropdownWidget->left,
|
||||||
w->y + dropdownWidget->top,
|
w->y + dropdownWidget->top,
|
||||||
dropdownWidget->bottom - dropdownWidget->top + 1,
|
dropdownWidget->bottom - dropdownWidget->top + 1,
|
||||||
w->colours[1],
|
w->colours[1],
|
||||||
0,
|
0x80,
|
||||||
numItems,
|
numItems,
|
||||||
widget->right - dropdownWidget->left
|
widget->right - dropdownWidget->left
|
||||||
);
|
);
|
||||||
|
|
||||||
for (i = 0; i < numItems; i++) {
|
for (i = 0; i < numItems; i++) {
|
||||||
gDropdownItemsFormat[i] = 1142;
|
|
||||||
if (window_ride_current_music_style_order[i] == ride->music)
|
if (window_ride_current_music_style_order[i] == ride->music)
|
||||||
gDropdownItemsChecked = (1 << i);
|
gDropdownItemsChecked = (1 << i);
|
||||||
gDropdownItemsArgs[i] = STR_MUSIC_STYLE_START + window_ride_current_music_style_order[i];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue