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

Use rct_widgetindex type

This commit is contained in:
Marijn van der Werf 2017-05-01 15:41:45 +02:00 committed by Michael Steenbeek
parent 31e8b510ec
commit a0259b79d4
74 changed files with 772 additions and 771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/openrct2/input.c
View File

@ -80,8 +80,8 @@ widget_ref gCurrentToolWidget;
static sint16 _clickRepeatTicks;
static sint32 game_get_next_input(sint32 *x, sint32 *y);
static void input_widget_over(sint32 x, sint32 y, rct_window *w, sint32 widgetIndex);
static void input_widget_over_change_check(rct_windowclass windowClass, rct_windownumber windowNumber, sint32 widgetIndex);
static void input_widget_over(sint32 x, sint32 y, rct_window *w, rct_widgetindex widgetIndex);
static void input_widget_over_change_check(rct_windowclass windowClass, rct_windownumber windowNumber, rct_widgetindex widgetIndex);
static void input_widget_over_flatbutton_invalidate();
void process_mouse_over(sint32 x, sint32 y);
void process_mouse_tool(sint32 x, sint32 y);
@ -93,27 +93,27 @@ sint32 get_next_key();
static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state);
void game_handle_edge_scroll();
void game_handle_key_scroll();
static void input_widget_left(sint32 x, sint32 y, rct_window *w, sint32 widgetIndex);
void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, sint32 widgetIndex, rct_window* w, rct_widget* widget);
static void input_widget_left(sint32 x, sint32 y, rct_window *w, rct_widgetindex widgetIndex);
void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget);
void sub_6ED990(uint8 cursor_id);
static void input_window_position_continue(rct_window *w, sint32 lastX, sint32 lastY, sint32 newX, sint32 newY);
static void input_window_position_end(rct_window *w, sint32 x, sint32 y);
static void input_window_resize_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y);
static void input_window_resize_begin(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void input_window_resize_continue(rct_window *w, sint32 x, sint32 y);
static void input_window_resize_end();
static void input_viewport_drag_begin(rct_window *w, sint32 x, sint32 y);
static void input_viewport_drag_continue();
static void input_viewport_drag_end();
static void input_scroll_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y);
static void input_scroll_continue(rct_window *w, sint32 widgetIndex, sint32 state, sint32 x, sint32 y);
static void input_scroll_begin(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void input_scroll_continue(rct_window *w, rct_widgetindex widgetIndex, sint32 state, sint32 x, sint32 y);
static void input_scroll_end();
static void input_scroll_part_update_hthumb(rct_window *w, sint32 widgetIndex, sint32 x, sint32 scroll_id);
static void input_scroll_part_update_hleft(rct_window *w, sint32 widgetIndex, sint32 scroll_id);
static void input_scroll_part_update_hright(rct_window *w, sint32 widgetIndex, sint32 scroll_id);
static void input_scroll_part_update_vthumb(rct_window *w, sint32 widgetIndex, sint32 y, sint32 scroll_id);
static void input_scroll_part_update_vtop(rct_window *w, sint32 widgetIndex, sint32 scroll_id);
static void input_scroll_part_update_vbottom(rct_window *w, sint32 widgetIndex, sint32 scroll_id);
static void input_update_tooltip(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y);
static void input_scroll_part_update_hthumb(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 scroll_id);
static void input_scroll_part_update_hleft(rct_window *w, rct_widgetindex widgetIndex, sint32 scroll_id);
static void input_scroll_part_update_hright(rct_window *w, rct_widgetindex widgetIndex, sint32 scroll_id);
static void input_scroll_part_update_vthumb(rct_window *w, rct_widgetindex widgetIndex, sint32 y, sint32 scroll_id);
static void input_scroll_part_update_vtop(rct_window *w, rct_widgetindex widgetIndex, sint32 scroll_id);
static void input_scroll_part_update_vbottom(rct_window *w, rct_widgetindex widgetIndex, sint32 scroll_id);
static void input_update_tooltip(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
#pragma region Mouse input
@ -188,7 +188,7 @@ static rct_mouse_data *get_mouse_input()
*
* rct2: 0x006E957F
*/
static void input_scroll_drag_begin(sint32 x, sint32 y, rct_window* w, rct_widget* widget, sint32 widgetIndex)
static void input_scroll_drag_begin(sint32 x, sint32 y, rct_window* w, rct_widget* widget, rct_widgetindex widgetIndex)
{
_inputState = INPUT_STATE_SCROLL_RIGHT;
gInputDragLastX = x;
@ -279,7 +279,7 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state)
{
rct_window *w;
rct_widget *widget;
sint32 widgetIndex;
rct_widgetindex widgetIndex;
// Get window and widget under cursor position
w = window_find_from_point(x, y);
@ -428,7 +428,7 @@ static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state)
#pragma region Window positioning / resizing
void input_window_position_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
void input_window_position_begin(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
_inputState = INPUT_STATE_POSITIONING_WINDOW;
gInputDragLastX = x - w->x;
@ -454,7 +454,7 @@ static void input_window_position_end(rct_window *w, sint32 x, sint32 y)
window_event_moved_call(w, x, y);
}
static void input_window_resize_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
static void input_window_resize_begin(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
_inputState = INPUT_STATE_RESIZING;
gInputDragLastX = x;
@ -564,7 +564,7 @@ static void input_viewport_drag_end()
#pragma region Scroll bars
static void input_scroll_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
static void input_scroll_begin(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
rct_widget *widget;
@ -634,7 +634,7 @@ static void input_scroll_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint
window_invalidate_by_number(widgetIndex, w->classification);
}
static void input_scroll_continue(rct_window *w, sint32 widgetIndex, sint32 state, sint32 x, sint32 y)
static void input_scroll_continue(rct_window *w, rct_widgetindex widgetIndex, sint32 state, sint32 x, sint32 y)
{
rct_widget *widget;
sint32 scroll_part, scroll_id;
@ -704,7 +704,7 @@ static void input_scroll_end()
*
* rct2: 0x006E98F2
*/
static void input_scroll_part_update_hthumb(rct_window *w, sint32 widgetIndex, sint32 x, sint32 scroll_id)
static void input_scroll_part_update_hthumb(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 scroll_id)
{
rct_widget *widget = &w->widgets[widgetIndex];
@ -741,7 +741,7 @@ static void input_scroll_part_update_hthumb(rct_window *w, sint32 widgetIndex, s
*
* rct2: 0x006E99A9
*/
static void input_scroll_part_update_vthumb(rct_window *w, sint32 widgetIndex, sint32 y, sint32 scroll_id)
static void input_scroll_part_update_vthumb(rct_window *w, rct_widgetindex widgetIndex, sint32 y, sint32 scroll_id)
{
assert(w != NULL);
rct_widget *widget = &w->widgets[widgetIndex];
@ -779,7 +779,7 @@ static void input_scroll_part_update_vthumb(rct_window *w, sint32 widgetIndex, s
*
* rct2: 0x006E9A60
*/
static void input_scroll_part_update_hleft(rct_window *w, sint32 widgetIndex, sint32 scroll_id)
static void input_scroll_part_update_hleft(rct_window *w, rct_widgetindex widgetIndex, sint32 scroll_id)
{
assert(w != NULL);
if (window_find_by_number(w->classification, w->number)) {
@ -795,7 +795,7 @@ static void input_scroll_part_update_hleft(rct_window *w, sint32 widgetIndex, si
*
* rct2: 0x006E9ABF
*/
static void input_scroll_part_update_hright(rct_window *w, sint32 widgetIndex, sint32 scroll_id)
static void input_scroll_part_update_hright(rct_window *w, rct_widgetindex widgetIndex, sint32 scroll_id)
{
assert(w != NULL);
rct_widget *widget = &w->widgets[widgetIndex];
@ -820,7 +820,7 @@ static void input_scroll_part_update_hright(rct_window *w, sint32 widgetIndex, s
*
* rct2: 0x006E9C37
*/
static void input_scroll_part_update_vtop(rct_window *w, sint32 widgetIndex, sint32 scroll_id)
static void input_scroll_part_update_vtop(rct_window *w, rct_widgetindex widgetIndex, sint32 scroll_id)
{
assert(w != NULL);
if (window_find_by_number(w->classification, w->number)) {
@ -836,7 +836,7 @@ static void input_scroll_part_update_vtop(rct_window *w, sint32 widgetIndex, sin
*
* rct2: 0x006E9C96
*/
static void input_scroll_part_update_vbottom(rct_window *w, sint32 widgetIndex, sint32 scroll_id)
static void input_scroll_part_update_vbottom(rct_window *w, rct_widgetindex widgetIndex, sint32 scroll_id)
{
assert(w != NULL);
rct_widget *widget = &w->widgets[widgetIndex];
@ -865,7 +865,7 @@ static void input_scroll_part_update_vbottom(rct_window *w, sint32 widgetIndex,
*
* rct2: 0x006E9253
*/
static void input_widget_over(sint32 x, sint32 y, rct_window *w, sint32 widgetIndex)
static void input_widget_over(sint32 x, sint32 y, rct_window *w, rct_widgetindex widgetIndex)
{
rct_windowclass windowClass = 255;
rct_windownumber windowNumber = 0;
@ -903,7 +903,7 @@ static void input_widget_over(sint32 x, sint32 y, rct_window *w, sint32 widgetIn
*
* rct2: 0x006E9269
*/
static void input_widget_over_change_check(rct_windowclass windowClass, rct_windownumber windowNumber, sint32 widgetIndex)
static void input_widget_over_change_check(rct_windowclass windowClass, rct_windownumber windowNumber, rct_widgetindex widgetIndex)
{
// Prevents invalid widgets being clicked source of bug is elsewhere
if (widgetIndex == -1)
@ -951,7 +951,7 @@ static void input_widget_over_flatbutton_invalidate()
*
* rct2: 0x006E95F9
*/
static void input_widget_left(sint32 x, sint32 y, rct_window *w, sint32 widgetIndex)
static void input_widget_left(sint32 x, sint32 y, rct_window *w, rct_widgetindex widgetIndex)
{
rct_windowclass windowClass = 255;
rct_windownumber windowNumber = 0;
@ -1049,7 +1049,7 @@ void process_mouse_over(sint32 x, sint32 y)
if (window != NULL) {
sint32 ebx, edi;
rct_window* subWindow;
sint32 widgetId = window_find_widget_from_point(window, x, y);
rct_widgetindex widgetId = window_find_widget_from_point(window, x, y);
if (widgetId != -1) {
switch (window->widgets[widgetId].type){
@ -1153,13 +1153,13 @@ void process_mouse_tool(sint32 x, sint32 y)
*
* rct2: 0x006E8DA7
*/
void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, sint32 widgetIndex, rct_window *w, rct_widget *widget)
void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
rct_windowclass cursor_w_class;
rct_windownumber cursor_w_number;
cursor_w_class = gPressedWidget.window_classification;
cursor_w_number = gPressedWidget.window_number;
sint32 cursor_widgetIndex = gPressedWidget.widget_index;
rct_widgetindex cursor_widgetIndex = gPressedWidget.widget_index;
rct_window *cursor_w = window_find_by_number(cursor_w_class, cursor_w_number);
if (cursor_w == NULL) {
@ -1360,7 +1360,7 @@ void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, sint32 widgetI
}
}
static void input_update_tooltip(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
static void input_update_tooltip(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (gTooltipWidget.window_classification == 255) {
if (gTooltipCursorX == x && gTooltipCursorY == y) {

2
src/openrct2/input.h
View File

@ -92,7 +92,7 @@ extern sint32 gTooltipCursorY;
extern TOOL_IDX gCurrentToolId;
extern widget_ref gCurrentToolWidget;
void input_window_position_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y);
void input_window_position_begin(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void title_handle_keyboard_input();
void game_handle_input();

86
src/openrct2/interface/widget.c
View File

@ -25,31 +25,31 @@
#include <math.h>
static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, sint32 l, sint32 t, sint32 r, sint32 b, sint32 colour);
static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, sint32 l, sint32 t, sint32 r, sint32 b, sint32 colour);
static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
/**
*
* rct2: 0x006EAF26
*/
void widget_scroll_update_thumbs(rct_window *w, sint32 widget_index)
void widget_scroll_update_thumbs(rct_window *w, rct_widgetindex widget_index)
{
rct_widget *widget = &w->widgets[widget_index];
rct_scroll* scroll = &w->scrolls[window_get_scroll_data_index(w, widget_index)];
@ -114,7 +114,7 @@ void widget_scroll_update_thumbs(rct_window *w, sint32 widget_index)
*
* rct2: 0x006EB2A8
*/
void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
switch (w->widgets[widgetIndex].type) {
case WWT_FRAME:
@ -182,7 +182,7 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
*
* rct2: 0x006EB6CE
*/
static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -218,7 +218,7 @@ static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widg
*
* rct2: 0x006EB765
*/
static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -251,7 +251,7 @@ static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 wid
*
* rct2: 0x006EB8E5
*/
static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -284,7 +284,7 @@ static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 wid
*
* rct2: 0x006EB806
*/
static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -323,7 +323,7 @@ static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widget
*
* rct2: 0x006EB861
*/
static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
if (!widget_is_disabled(w, widgetIndex) && widget_is_highlighted(w, widgetIndex)) {
widget_button_draw(dpi, w, widgetIndex);
@ -362,7 +362,7 @@ static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint3
*
* rct2: 0x006EBBEB
*/
static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -388,7 +388,7 @@ static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, sint32 wid
*
* rct2: 0x006EBC41
*/
static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -442,7 +442,7 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, sint32 wi
*
* rct2: 0x006EBD52
*/
static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -468,7 +468,7 @@ static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetInde
*
* rct2: 0x006EBD1F
*/
static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -490,7 +490,7 @@ static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, sint32 widg
*
* rct2: 0x006EC1A6
*/
static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -519,7 +519,7 @@ static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widge
*
* rct2: 0x006EB535
*/
static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -575,7 +575,7 @@ static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 w
*
* rct2: 0x006EB2F9
*/
static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -621,7 +621,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 wi
*
* rct2: 0x006EBB85
*/
static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -661,7 +661,7 @@ static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 w
*
* rct2: 0x006EBAD9
*/
static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -701,7 +701,7 @@ static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 w
*
* rct2: 0x006EBD96
*/
static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
sint32 scrollIndex = window_get_scroll_data_index(w, widgetIndex);
@ -824,7 +824,7 @@ static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, s
*
* rct2: 0x006EB951
*/
static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
// Get the widget
rct_widget *widget = &w->widgets[widgetIndex];
@ -869,17 +869,17 @@ static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 widg
}
}
sint32 widget_is_enabled(rct_window *w, sint32 widgetIndex)
sint32 widget_is_enabled(rct_window *w, rct_widgetindex widgetIndex)
{
return (w->enabled_widgets & (1LL << widgetIndex)) ? 1 : 0;
}
sint32 widget_is_disabled(rct_window *w, sint32 widgetIndex)
sint32 widget_is_disabled(rct_window *w, rct_widgetindex widgetIndex)
{
return (w->disabled_widgets & (1LL << widgetIndex)) ? 1 : 0;
}
sint32 widget_is_pressed(rct_window *w, sint32 widgetIndex)
sint32 widget_is_pressed(rct_window *w, rct_widgetindex widgetIndex)
{
if (w->pressed_widgets & (1LL << widgetIndex)) {
return 1;
@ -894,7 +894,7 @@ sint32 widget_is_pressed(rct_window *w, sint32 widgetIndex)
return 0;
}
sint32 widget_is_highlighted(rct_window *w, sint32 widgetIndex)
sint32 widget_is_highlighted(rct_window *w, rct_widgetindex widgetIndex)
{
if (gHoverWidget.window_classification != w->classification) return 0;
if (gHoverWidget.window_number != w->number) return 0;
@ -902,7 +902,7 @@ sint32 widget_is_highlighted(rct_window *w, sint32 widgetIndex)
return 1;
}
sint32 widget_is_active_tool(rct_window *w, sint32 widgetIndex)
sint32 widget_is_active_tool(rct_window *w, rct_widgetindex widgetIndex)
{
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return 0;
@ -1031,7 +1031,7 @@ void widget_scroll_get_part(rct_window *w, rct_widget *widget, sint32 x, sint32
}
}
void widget_set_enabled(rct_window *w, uint64 widgetIndex, bool enabled)
void widget_set_enabled(rct_window *w, rct_widgetindex widgetIndex, bool enabled)
{
if (enabled) {
w->enabled_widgets |= (1ULL << widgetIndex);
@ -1043,7 +1043,7 @@ void widget_set_enabled(rct_window *w, uint64 widgetIndex, bool enabled)
}
}
void widget_set_checkbox_value(rct_window *w, sint32 widgetIndex, sint32 value)
void widget_set_checkbox_value(rct_window *w, rct_widgetindex widgetIndex, sint32 value)
{
if (value)
w->pressed_widgets |= (1ULL << widgetIndex);
@ -1051,7 +1051,7 @@ void widget_set_checkbox_value(rct_window *w, sint32 widgetIndex, sint32 value)
w->pressed_widgets &= ~(1ULL << widgetIndex);
}
static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex)
static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex)
{
sint32 no_lines = 0;
sint32 font_height = 0;

18
src/openrct2/interface/widget.h
View File

@ -57,17 +57,17 @@ enum {
SCROLL_BOTH = SCROLL_HORIZONTAL | SCROLL_VERTICAL
};
void widget_scroll_update_thumbs(rct_window *w, sint32 widget_index);
void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex);
void widget_scroll_update_thumbs(rct_window *w, rct_widgetindex widget_index);
void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex);
sint32 widget_is_enabled(rct_window *w, sint32 widgetIndex);
sint32 widget_is_disabled(rct_window *w, sint32 widgetIndex);
sint32 widget_is_pressed(rct_window *w, sint32 widgetIndex);
sint32 widget_is_highlighted(rct_window *w, sint32 widgetIndex);
sint32 widget_is_active_tool(rct_window *w, sint32 widgetIndex);
sint32 widget_is_enabled(rct_window *w, rct_widgetindex widgetIndex);
sint32 widget_is_disabled(rct_window *w, rct_widgetindex widgetIndex);
sint32 widget_is_pressed(rct_window *w, rct_widgetindex widgetIndex);
sint32 widget_is_highlighted(rct_window *w, rct_widgetindex widgetIndex);
sint32 widget_is_active_tool(rct_window *w, rct_widgetindex widgetIndex);
void widget_scroll_get_part(rct_window *w, rct_widget* widget, sint32 x, sint32 y, sint32 *output_x, sint32 *output_y, sint32 *output_scroll_area, sint32 *scroll_id);
void widget_set_enabled(rct_window *w, uint64 widgetIndex, bool enabled);
void widget_set_checkbox_value(rct_window *w, sint32 widgetIndex, sint32 value);
void widget_set_enabled(rct_window *w, rct_widgetindex widgetIndex, bool enabled);
void widget_set_checkbox_value(rct_window *w, rct_widgetindex widgetIndex, sint32 value);
#endif

55
src/openrct2/interface/window.c
View File

@ -95,7 +95,7 @@ static sint32 window_get_scroll_index(rct_window *w, sint32 targetWidgetIndex)
return -1;
sint32 scrollIndex = 0;
sint32 widgetIndex = 0;
rct_widgetindex widgetIndex = 0;
for (rct_widget *widget = w->widgets; widget->type != WWT_LAST; widget++, widgetIndex++) {
if (widgetIndex == targetWidgetIndex)
break;
@ -192,7 +192,7 @@ static void window_scroll_wheel_input(rct_window *w, sint32 scrollIndex, sint32
{
rct_scroll *scroll = &w->scrolls[scrollIndex];
rct_widget *widget = window_get_scroll_widget(w, scrollIndex);
sint32 widgetIndex = window_get_widget_index(w, widget);
rct_widgetindex widgetIndex = window_get_widget_index(w, widget);
if (scroll->flags & VSCROLLBAR_VISIBLE) {
sint32 size = widget->bottom - widget->top - 1;
@ -250,7 +250,7 @@ static void window_viewport_wheel_input(rct_window *w, sint32 wheel)
window_zoom_out(w, true);
}
static bool window_other_wheel_input(rct_window *w, sint32 widgetIndex, sint32 wheel)
static bool window_other_wheel_input(rct_window *w, rct_widgetindex widgetIndex, sint32 wheel)
{
// HACK: Until we have a new window system that allows us to add new events like mouse wheel easily,
// this selective approach will have to do.
@ -279,7 +279,7 @@ static bool window_other_wheel_input(rct_window *w, sint32 widgetIndex, sint32 w
// Preview / Increment / Decrement
if (widgetIndex >= previewWidgetIndex && widgetIndex < previewWidgetIndex + 3) {
sint32 buttonWidgetIndex = wheel < 0 ? previewWidgetIndex + 2 : previewWidgetIndex + 1;
rct_widgetindex buttonWidgetIndex = wheel < 0 ? previewWidgetIndex + 2 : previewWidgetIndex + 1;
window_event_mouse_up_call(w, buttonWidgetIndex);
return true;
}
@ -326,7 +326,7 @@ static void window_all_wheel_input()
}
// Check scroll view, cursor is over
sint32 widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y);
rct_widgetindex widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y);
if (widgetIndex != -1) {
rct_widget *widget = &w->widgets[widgetIndex];
if (widget->type == WWT_SCROLL) {
@ -890,13 +890,13 @@ rct_window *window_find_from_point(sint32 x, sint32 y)
* returns widget_index (edx)
* EDI NEEDS TO BE SET TO w->widgets[widget_index] AFTER
*/
sint32 window_find_widget_from_point(rct_window *w, sint32 x, sint32 y)
rct_widgetindex window_find_widget_from_point(rct_window *w, sint32 x, sint32 y)
{
// Invalidate the window
window_event_invalidate_call(w);
// Find the widget at point x, y
sint32 widget_index = -1;
rct_widgetindex widget_index = -1;
for (sint32 i = 0;; i++) {
rct_widget *widget = &w->widgets[i];
if (widget->type == WWT_LAST) {
@ -976,7 +976,7 @@ void window_invalidate_all()
* Invalidates the specified widget of a window.
* rct2: 0x006EC402
*/
void widget_invalidate(rct_window *w, sint32 widgetIndex)
void widget_invalidate(rct_window *w, rct_widgetindex widgetIndex)
{
rct_widget* widget;
@ -997,7 +997,7 @@ void widget_invalidate(rct_window *w, sint32 widgetIndex)
/**
* Invalidates the specified widget of all windows that match the specified window class.
*/
void widget_invalidate_by_class(rct_windowclass cls, sint32 widgetIndex)
void widget_invalidate_by_class(rct_windowclass cls, rct_widgetindex widgetIndex)
{
rct_window* w;
@ -1013,7 +1013,7 @@ void widget_invalidate_by_class(rct_windowclass cls, sint32 widgetIndex)
* @param cls (al) with bit 15 set
* @param number (bx)
*/
void widget_invalidate_by_number(rct_windowclass cls, rct_windownumber number, sint32 widgetIndex)
void widget_invalidate_by_number(rct_windowclass cls, rct_windownumber number, rct_widgetindex widgetIndex)
{
rct_window* w;
@ -1073,7 +1073,8 @@ void window_init_scroll_widgets(rct_window *w)
*/
void window_update_scroll_widgets(rct_window *w)
{
sint32 widgetIndex, scrollIndex, width, height, scrollPositionChanged;
sint32 scrollIndex, width, height, scrollPositionChanged;
rct_widgetindex widgetIndex;
rct_scroll *scroll;
rct_widget *widget;
@ -1116,7 +1117,7 @@ void window_update_scroll_widgets(rct_window *w)
}
}
sint32 window_get_scroll_data_index(rct_window *w, sint32 widget_index)
sint32 window_get_scroll_data_index(rct_window *w, rct_widgetindex widget_index)
{
sint32 i, result;
@ -1723,7 +1724,7 @@ static void window_draw_single(rct_drawpixelinfo *dpi, rct_window *w, sint32 lef
void window_draw_widgets(rct_window *w, rct_drawpixelinfo *dpi)
{
rct_widget *widget;
sint32 widgetIndex;
rct_widgetindex widgetIndex;
if ((w->flags & WF_TRANSPARENT) && !(w->flags & WF_NO_BACKGROUND))
gfx_filter_rect(dpi, w->x, w->y, w->x + w->width - 1, w->y + w->height - 1, PALETTE_51);
@ -1903,7 +1904,7 @@ void window_event_close_call(rct_window *w)
w->event_handlers->close(w);
}
void window_event_mouse_up_call(rct_window *w, sint32 widgetIndex)
void window_event_mouse_up_call(rct_window *w, rct_widgetindex widgetIndex)
{
if (w->event_handlers->mouse_up != NULL)
w->event_handlers->mouse_up(w, widgetIndex);
@ -1915,13 +1916,13 @@ void window_event_resize_call(rct_window *w)
w->event_handlers->resize(w);
}
void window_event_mouse_down_call(rct_window *w, sint32 widgetIndex)
void window_event_mouse_down_call(rct_window *w, rct_widgetindex widgetIndex)
{
if (w->event_handlers->mouse_down != NULL)
w->event_handlers->mouse_down(widgetIndex, w, &w->widgets[widgetIndex]);
}
void window_event_dropdown_call(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
void window_event_dropdown_call(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (w->event_handlers->dropdown != NULL)
w->event_handlers->dropdown(w, widgetIndex, dropdownIndex);
@ -1951,31 +1952,31 @@ void window_event_unknown_08_call(rct_window *w)
w->event_handlers->unknown_08(w);
}
void window_event_tool_update_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
void window_event_tool_update_call(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (w->event_handlers->tool_update != NULL)
w->event_handlers->tool_update(w, widgetIndex, x, y);
}
void window_event_tool_down_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
void window_event_tool_down_call(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (w->event_handlers->tool_down != NULL)
w->event_handlers->tool_down(w, widgetIndex, x, y);
}
void window_event_tool_drag_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
void window_event_tool_drag_call(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (w->event_handlers->tool_drag != NULL)
w->event_handlers->tool_drag(w, widgetIndex, x, y);
}
void window_event_tool_up_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
void window_event_tool_up_call(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (w->event_handlers->tool_up != NULL)
w->event_handlers->tool_up(w, widgetIndex, x, y);
}
void window_event_tool_abort_call(rct_window *w, sint32 widgetIndex)
void window_event_tool_abort_call(rct_window *w, rct_widgetindex widgetIndex)
{
if (w->event_handlers->tool_abort != NULL)
w->event_handlers->tool_abort(w, widgetIndex);
@ -2012,7 +2013,7 @@ void window_event_scroll_mouseover_call(rct_window *w, sint32 scrollIndex, sint3
w->event_handlers->scroll_mouseover(w, scrollIndex, x, y);
}
void window_event_textinput_call(rct_window *w, sint32 widgetIndex, char *text)
void window_event_textinput_call(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (w->event_handlers->text_input != NULL)
w->event_handlers->text_input(w, widgetIndex, text);
@ -2030,7 +2031,7 @@ void window_event_unknown_15_call(rct_window *w, sint32 scrollIndex, sint32 scro
w->event_handlers->unknown_15(w, scrollIndex, scrollAreaType);
}
rct_string_id window_event_tooltip_call(rct_window *w, sint32 widgetIndex)
rct_string_id window_event_tooltip_call(rct_window *w, rct_widgetindex widgetIndex)
{
rct_string_id result = 0;
if (w->event_handlers->tooltip != NULL)
@ -2038,7 +2039,7 @@ rct_string_id window_event_tooltip_call(rct_window *w, sint32 widgetIndex)
return result;
}
sint32 window_event_cursor_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
sint32 window_event_cursor_call(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
sint32 cursorId = CURSOR_ARROW;
if (w->event_handlers->cursor != NULL)
@ -2205,7 +2206,7 @@ void window_resize_gui_scenario_editor(sint32 width, sint32 height)
}
/* Based on rct2: 0x6987ED and another version from window_park */
void window_align_tabs(rct_window *w, uint8 start_tab_id, uint8 end_tab_id)
void window_align_tabs(rct_window *w, rct_widgetindex start_tab_id, rct_widgetindex end_tab_id)
{
sint32 i, x = w->widgets[start_tab_id].left;
sint32 tab_width = w->widgets[start_tab_id].right - w->widgets[start_tab_id].left;
@ -2237,7 +2238,7 @@ void window_close_construction_windows()
*/
static void window_invalidate_pressed_image_buttons(rct_window *w)
{
sint32 widgetIndex;
rct_widgetindex widgetIndex;
rct_widget *widget;
widgetIndex = 0;
@ -2472,7 +2473,7 @@ void textinput_cancel()
window_close_by_class(WC_TEXTINPUT);
}
void window_start_textbox(rct_window *call_w, sint32 call_widget, rct_string_id existing_text, char * existing_args, sint32 maxLength)
void window_start_textbox(rct_window *call_w, rct_widgetindex call_widget, rct_string_id existing_text, char * existing_args, sint32 maxLength)
{
if (gUsingWidgetTextBox)
window_cancel_textbox();

70
src/openrct2/interface/window.h
View File

@ -55,7 +55,7 @@ typedef struct window_identifier {
typedef struct widget_identifier {
window_identifier window;
sint32 widget_index;
rct_widgetindex widget_index;
} widget_identifier;
extern widget_identifier gCurrentTextBox;
@ -150,29 +150,29 @@ enum{
typedef struct rct_window_event_list {
void (*close)(struct rct_window*);
void (*mouse_up)(struct rct_window*, sint32);
void (*mouse_up)(struct rct_window*, rct_widgetindex);
void (*resize)(struct rct_window*);
void (*mouse_down)(sint32, struct rct_window*, rct_widget*);
void (*dropdown)(struct rct_window*, sint32, sint32);
void (*mouse_down)(rct_widgetindex, struct rct_window*, rct_widget*);
void (*dropdown)(struct rct_window*, rct_widgetindex, sint32);
void (*unknown_05)(struct rct_window*);
void (*update)(struct rct_window*);
void (*unknown_07)(struct rct_window*);
void (*unknown_08)(struct rct_window*);
void (*tool_update)(struct rct_window*, sint32, sint32, sint32);
void (*tool_down)(struct rct_window*, sint32, sint32, sint32);
void (*tool_drag)(struct rct_window*, sint32, sint32, sint32);
void (*tool_up)(struct rct_window*, sint32, sint32, sint32);
void (*tool_abort)(struct rct_window*, sint32);
void (*tool_update)(struct rct_window*, rct_widgetindex, sint32, sint32);
void (*tool_down)(struct rct_window*, rct_widgetindex, sint32, sint32);
void (*tool_drag)(struct rct_window*, rct_widgetindex, sint32, sint32);
void (*tool_up)(struct rct_window*, rct_widgetindex, sint32, sint32);
void (*tool_abort)(struct rct_window*, rct_widgetindex);
void (*unknown_0E)(struct rct_window*);
void (*get_scroll_size)(struct rct_window*, sint32, sint32*, sint32*);
void (*scroll_mousedown)(struct rct_window*, sint32, sint32, sint32);
void (*scroll_mousedrag)(struct rct_window*, sint32, sint32, sint32);
void (*scroll_mouseover)(struct rct_window*, sint32, sint32, sint32);
void (*text_input)(struct rct_window*, sint32, char*);
void (*text_input)(struct rct_window*, rct_widgetindex, char*);
void (*unknown_14)(struct rct_window*);
void (*unknown_15)(struct rct_window*, sint32, sint32);
void (*tooltip)(struct rct_window*, sint32, rct_string_id*);
void (*cursor)(struct rct_window*, sint32, sint32, sint32, sint32*);
void (*tooltip)(struct rct_window*, rct_widgetindex, rct_string_id*);
void (*cursor)(struct rct_window*, rct_widgetindex, sint32, sint32, sint32*);
void (*moved)(struct rct_window*, sint32, sint32);
void (*invalidate)(struct rct_window*);
void (*paint)(struct rct_window*, rct_drawpixelinfo*);
@ -617,17 +617,17 @@ void window_close_all_except_class(rct_windowclass cls);
rct_window *window_find_by_class(rct_windowclass cls);
rct_window *window_find_by_number(rct_windowclass cls, rct_windownumber number);
rct_window *window_find_from_point(sint32 x, sint32 y);
sint32 window_find_widget_from_point(rct_window *w, sint32 x, sint32 y);
rct_widgetindex window_find_widget_from_point(rct_window *w, sint32 x, sint32 y);
void window_invalidate(rct_window *window);
void window_invalidate_by_class(rct_windowclass cls);
void window_invalidate_by_number(rct_windowclass cls, rct_windownumber number);
void window_invalidate_all();
void widget_invalidate(rct_window *w, sint32 widgetIndex);
void widget_invalidate_by_class(rct_windowclass cls, sint32 widgetIndex);
void widget_invalidate_by_number(rct_windowclass cls, rct_windownumber number, sint32 widgetIndex);
void widget_invalidate(rct_window *w, rct_widgetindex widgetIndex);
void widget_invalidate_by_class(rct_windowclass cls, rct_widgetindex widgetIndex);
void widget_invalidate_by_number(rct_windowclass cls, rct_windownumber number, rct_widgetindex widgetIndex);
void window_init_scroll_widgets(rct_window *w);
void window_update_scroll_widgets(rct_window *w);
sint32 window_get_scroll_data_index(rct_window *w, sint32 widget_index);
sint32 window_get_scroll_data_index(rct_window *w, rct_widgetindex widget_index);
rct_window *window_bring_to_front(rct_window *w);
rct_window *window_bring_to_front_by_class(rct_windowclass cls);
@ -649,7 +649,7 @@ void window_zoom_in(rct_window *w, bool atCursor);
void window_zoom_out(rct_window *w, bool atCursor);
void main_window_zoom(bool zoomIn, bool atCursor);
void window_show_textinput(rct_window *w, sint32 widgetIndex, uint16 title, uint16 text, sint32 value);
void window_show_textinput(rct_window *w, rct_widgetindex widgetIndex, uint16 title, uint16 text, sint32 value);
void window_text_input_key(rct_window* w, sint32 key);
void window_draw_all(rct_drawpixelinfo *dpi, sint16 left, sint16 top, sint16 right, sint16 bottom);
@ -743,8 +743,8 @@ void window_server_list_open();
void window_server_start_open();
void window_research_open();
void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 baseWidgetIndex);
void window_research_funding_page_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 baseWidgetIndex);
void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dpi, rct_widgetindex baseWidgetIndex);
void window_research_funding_page_paint(rct_window *w, rct_drawpixelinfo *dpi, rct_widgetindex baseWidgetIndex);
void window_scenery_open();
void window_music_credits_open();
@ -756,8 +756,8 @@ void window_title_editor_open(sint32 tab);
void window_title_command_editor_open(struct TitleSequence * sequence, sint32 command, bool insert);
void window_tile_inspector_open();
void window_tile_inspector_clear_clipboard();
void window_text_input_open(rct_window* call_w, sint32 call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, sint32 maxLength);
void window_text_input_raw_open(rct_window* call_w, sint32 call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, sint32 maxLength);
void window_text_input_open(rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, sint32 maxLength);
void window_text_input_raw_open(rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, sint32 maxLength);
rct_window *window_mapgen_open();
rct_window *window_loadsave_open(sint32 type, char *defaultName);
rct_window *window_changelog_open();
@ -777,7 +777,7 @@ void window_guest_list_init_vars_a();
void window_guest_list_init_vars_b();
void window_bubble_list_item(rct_window* w, sint32 item_position);
void window_align_tabs( rct_window *w, uint8 start_tab_id, uint8 end_tab_id );
void window_align_tabs( rct_window *w, rct_widgetindex start_tab_id, rct_widgetindex end_tab_id );
void window_new_ride_init_vars();
void window_new_ride_focus(ride_list_item rideItem);
@ -791,29 +791,29 @@ void game_command_callback_pickup_guest(sint32 eax, sint32 ebx, sint32 ecx, sint
void game_command_callback_pickup_staff(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp);
void window_event_close_call(rct_window* w);
void window_event_mouse_up_call(rct_window* w, sint32 widgetIndex);
void window_event_mouse_up_call(rct_window* w, rct_widgetindex widgetIndex);
void window_event_resize_call(rct_window* w);
void window_event_mouse_down_call(rct_window *w, sint32 widgetIndex);
void window_event_dropdown_call(rct_window* w, sint32 widgetIndex, sint32 dropdownIndex);
void window_event_mouse_down_call(rct_window *w, rct_widgetindex widgetIndex);
void window_event_dropdown_call(rct_window* w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
void window_event_unknown_05_call(rct_window* w);
void window_event_update_call(rct_window *w);
void window_event_unknown_07_call(rct_window* w);
void window_event_unknown_08_call(rct_window* w);
void window_event_tool_update_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
void window_event_tool_down_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
void window_event_tool_drag_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
void window_event_tool_up_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
void window_event_tool_abort_call(rct_window* w, sint32 widgetIndex);
void window_event_tool_update_call(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_event_tool_down_call(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_event_tool_drag_call(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_event_tool_up_call(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_event_tool_abort_call(rct_window* w, rct_widgetindex widgetIndex);
void window_event_unknown_0E_call(rct_window* w);
void window_get_scroll_size(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
void window_event_scroll_mousedown_call(rct_window* w, sint32 scrollIndex, sint32 x, sint32 y);
void window_event_scroll_mousedrag_call(rct_window* w, sint32 scrollIndex, sint32 x, sint32 y);
void window_event_scroll_mouseover_call(rct_window* w, sint32 scrollIndex, sint32 x, sint32 y);
void window_event_textinput_call(rct_window *w, sint32 widgetIndex, char *text);
void window_event_textinput_call(rct_window *w, rct_widgetindex widgetIndex, char *text);
void window_event_unknown_14_call(rct_window* w);
void window_event_unknown_15_call(rct_window* w, sint32 scrollIndex, sint32 scrollAreaType);
rct_string_id window_event_tooltip_call(rct_window* w, sint32 widgetIndex);
sint32 window_event_cursor_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
rct_string_id window_event_tooltip_call(rct_window* w, rct_widgetindex widgetIndex);
sint32 window_event_cursor_call(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_event_moved_call(rct_window* w, sint32 x, sint32 y);
void window_event_invalidate_call(rct_window* w);
void window_event_paint_call(rct_window* w, rct_drawpixelinfo *dpi);
@ -825,7 +825,7 @@ void textinput_cancel();
void window_move_and_snap(rct_window *w, sint32 newWindowX, sint32 newWindowY, sint32 snapProximity);
sint32 window_can_resize(rct_window *w);
void window_start_textbox(rct_window *call_w, sint32 call_widget, rct_string_id existing_text, char *existing_args, sint32 maxLength);
void window_start_textbox(rct_window *call_w, rct_widgetindex call_widget, rct_string_id existing_text, char *existing_args, sint32 maxLength);
void window_cancel_textbox();
void window_update_textbox_caret();
void window_update_textbox();

4
src/openrct2/windows/about.c
View File

@ -37,7 +37,7 @@ rct_widget window_about_widgets[] = {
{ WIDGETS_END },
};
static void window_about_mouseup(rct_window *w, sint32 widgetIndex);
static void window_about_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_about_paint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_about_events = {
@ -104,7 +104,7 @@ void window_about_open()
*
* rct2: 0x0066D4D5
*/
static void window_about_mouseup(rct_window *w, sint32 widgetIndex)
static void window_about_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:

16
src/openrct2/windows/banner.c
View File

@ -76,10 +76,10 @@ rct_widget window_banner_widgets[] = {
{ WIDGETS_END },
};
static void window_banner_mouseup(rct_window *w, sint32 widgetIndex);
static void window_banner_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_banner_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_banner_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_banner_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_banner_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_banner_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_banner_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_banner_unknown_14(rct_window *w);
static void window_banner_invalidate(rct_window *w);
static void window_banner_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -189,7 +189,7 @@ void window_banner_open(rct_windownumber number)
*
* rct2: 0x6ba4d6
*/
static void window_banner_mouseup(rct_window *w, sint32 widgetIndex)
static void window_banner_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_banner* banner = &gBanners[w->number];
sint32 x = banner->x << 5;
@ -224,7 +224,7 @@ static void window_banner_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x6ba4ff
*/
static void window_banner_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_banner_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
rct_banner* banner = &gBanners[w->number];
@ -261,7 +261,7 @@ static void window_banner_mousedown(sint32 widgetIndex, rct_window*w, rct_widget
*
* rct2: 0x6ba517
*/
static void window_banner_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_banner_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
rct_banner* banner = &gBanners[w->number];
@ -285,7 +285,7 @@ static void window_banner_dropdown(rct_window *w, sint32 widgetIndex, sint32 dro
*
* rct2: 0x6ba50c
*/
static void window_banner_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_banner_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex == WIDX_BANNER_TEXT && text != NULL) {
game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 0)), GAME_COMMAND_SET_BANNER_NAME, *((sint32*)(text + 8)), *((sint32*)(text + 4)));

4
src/openrct2/windows/changelog.c
View File

@ -50,7 +50,7 @@ rct_widget window_changelog_widgets[] = {
};
static void window_changelog_close(rct_window *w);
static void window_changelog_mouseup(rct_window *w, sint32 widgetIndex);
static void window_changelog_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_changelog_resize(rct_window *w);
static void window_changelog_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_changelog_invalidate(rct_window *w);
@ -134,7 +134,7 @@ static void window_changelog_close(rct_window *w)
window_changelog_dispose_file();
}
static void window_changelog_mouseup(rct_window *w, sint32 widgetIndex)
static void window_changelog_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:

32
src/openrct2/windows/cheats.c
View File

@ -292,18 +292,18 @@ static rct_widget *window_cheats_page_widgets[] = {
window_cheats_rides_widgets,
};
static void window_cheats_money_mouseup(rct_window *w, sint32 widgetIndex);
static void window_cheats_money_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget);
static void window_cheats_misc_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget);
static void window_cheats_misc_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_cheats_guests_mouseup(rct_window *w, sint32 widgetIndex);
static void window_cheats_misc_mouseup(rct_window *w, sint32 widgetIndex);
static void window_cheats_rides_mouseup(rct_window *w, sint32 widgetIndex);
static void window_cheats_money_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_cheats_money_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget);
static void window_cheats_misc_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget);
static void window_cheats_misc_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_cheats_guests_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_cheats_misc_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_cheats_rides_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_cheats_update(rct_window *w);
static void window_cheats_invalidate(rct_window *w);
static void window_cheats_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_cheats_set_page(rct_window *w, sint32 page);
static void window_cheats_text_input(rct_window *w, sint32 widgetIndex, char *text);
static void window_cheats_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
static rct_window_event_list window_cheats_money_events = {
NULL,
@ -496,7 +496,7 @@ void window_cheats_open()
park_rating_spinner_value = get_forced_park_rating() >= 0 ? get_forced_park_rating() : 999;
}
static void window_cheats_money_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_cheats_money_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
switch (widgetIndex) {
case WIDX_MONEY_SPINNER_INCREMENT:
@ -513,7 +513,7 @@ static void window_cheats_money_mousedown(sint32 widgetIndex, rct_window *w, rct
}
}
static void window_cheats_misc_mousedown(int widgetIndex, rct_window *w, rct_widget* widget)
static void window_cheats_misc_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
switch (widgetIndex) {
case WIDX_INCREASE_PARK_RATING:
@ -556,7 +556,7 @@ static void window_cheats_misc_mousedown(int widgetIndex, rct_window *w, rct_wid
}
}
static void window_cheats_misc_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_cheats_misc_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex != WIDX_WEATHER_DROPDOWN_BUTTON || dropdownIndex == -1)
return;
@ -564,7 +564,7 @@ static void window_cheats_misc_dropdown(rct_window *w, sint32 widgetIndex, sint3
game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_FORCEWEATHER, dropdownIndex, GAME_COMMAND_CHEAT, 0, 0);
}
static void window_cheats_money_mouseup(rct_window *w, sint32 widgetIndex)
static void window_cheats_money_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -592,7 +592,7 @@ static void window_cheats_money_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_cheats_guests_mouseup(rct_window *w, sint32 widgetIndex)
static void window_cheats_guests_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -685,7 +685,7 @@ static void window_cheats_guests_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_cheats_misc_mouseup(rct_window *w, sint32 widgetIndex)
static void window_cheats_misc_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -760,7 +760,7 @@ static void window_cheats_misc_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_cheats_rides_mouseup(rct_window *w, sint32 widgetIndex)
static void window_cheats_rides_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -829,7 +829,7 @@ static void window_cheats_rides_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_cheats_text_input(rct_window *w, int widgetIndex, char *text) {
static void window_cheats_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text) {
if (text == NULL)
return;

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

@ -55,11 +55,11 @@ rct_widget window_clear_scenery_widgets[] = {
};
static void window_clear_scenery_close(rct_window *w);
static void window_clear_scenery_mouseup(rct_window *w, sint32 widgetIndex);
static void window_clear_scenery_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_clear_scenery_update(rct_window *w);
static void window_clear_scenery_invalidate(rct_window *w);
static void window_clear_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_clear_scenery_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_clear_scenery_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_clear_scenery_inputsize(rct_window *w);
static rct_window_event_list window_clear_scenery_events = {
@ -134,7 +134,7 @@ static void window_clear_scenery_close(rct_window *w)
*
* rct2: 0x0068E185
*/
static void window_clear_scenery_mouseup(rct_window *w, sint32 widgetIndex)
static void window_clear_scenery_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -172,7 +172,7 @@ static void window_clear_scenery_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_clear_scenery_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_clear_scenery_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
sint32 size;
char* end;

16
src/openrct2/windows/custom_currency.c
View File

@ -51,10 +51,10 @@ rct_widget window_custom_currency_widgets[] = {
};
static void custom_currency_window_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void custom_currency_window_mouseup(rct_window *w, sint32 widgetIndex);
static void custom_currency_window_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void custom_currency_window_text_input(struct rct_window *w, sint32 widgetIndex, char *text);
static void custom_currency_window_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void custom_currency_window_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void custom_currency_window_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void custom_currency_window_text_input(struct rct_window *w, rct_widgetindex widgetIndex, char *text);
static void custom_currency_window_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -125,7 +125,7 @@ void custom_currency_window_open()
static void custom_currency_window_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void custom_currency_window_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
widget = &w->widgets[widgetIndex - 1];
@ -191,7 +191,7 @@ static void custom_currency_window_mousedown(sint32 widgetIndex, rct_window *w,
}
}
static void custom_currency_window_mouseup(rct_window *w, sint32 widgetIndex)
static void custom_currency_window_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch(widgetIndex) {
case WIDX_RATE:
@ -208,7 +208,7 @@ static void custom_currency_window_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void custom_currency_window_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void custom_currency_window_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if(dropdownIndex == -1)
return;
@ -232,7 +232,7 @@ static void custom_currency_window_dropdown(rct_window *w, sint32 widgetIndex, s
}
}
static void custom_currency_window_text_input(struct rct_window *w, sint32 widgetIndex, char *text)
static void custom_currency_window_text_input(struct rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (text == NULL)
return;

4
src/openrct2/windows/debug_paint.c
View File

@ -45,7 +45,7 @@ static rct_widget window_debug_paint_widgets[] = {
{ WIDGETS_END },
};
static void window_debug_paint_mouseup(rct_window * w, sint32 widgetIndex);
static void window_debug_paint_mouseup(rct_window * w, rct_widgetindex widgetIndex);
static void window_debug_paint_invalidate(rct_window * w);
static void window_debug_paint_paint(rct_window * w, rct_drawpixelinfo * dpi);
@ -107,7 +107,7 @@ void window_debug_paint_open()
window->colours[1] = COLOUR_GREY;
}
static void window_debug_paint_mouseup(rct_window * w, sint32 widgetIndex)
static void window_debug_paint_mouseup(rct_window * w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_TOGGLE_OLD_DRAWING:

4
src/openrct2/windows/demolish_ride_prompt.c
View File

@ -45,7 +45,7 @@ static rct_widget window_ride_demolish_widgets[] = {
{ WIDGETS_END }
};
static void window_ride_demolish_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_demolish_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_demolish_invalidate(rct_window *w);
static void window_ride_demolish_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -102,7 +102,7 @@ void window_ride_demolish_prompt_open(sint32 rideIndex)
*
* rct2: 0x006B4933
*/
static void window_ride_demolish_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_demolish_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_DEMOLISH:

4
src/openrct2/windows/editor_bottom_toolbar.c
View File

@ -48,7 +48,7 @@ static rct_widget window_editor_bottom_toolbar_widgets[] = {
{ WIDGETS_END },
};
static void window_editor_bottom_toolbar_mouseup(rct_window *w, sint32 widgetIndex);
static void window_editor_bottom_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_bottom_toolbar_invalidate(rct_window *w);
static void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -350,7 +350,7 @@ void window_editor_bottom_toolbar_jump_forward_to_save_scenario()
*
* rct2: 0x0066F5AE
*/
static void window_editor_bottom_toolbar_mouseup(rct_window *w, sint32 widgetIndex)
static void window_editor_bottom_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_PREVIOUS_STEP_BUTTON) {
if ((gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) ||

18
src/openrct2/windows/editor_inventions_list.c
View File

@ -71,18 +71,18 @@ static rct_widget window_editor_inventions_list_drag_widgets[] = {
#pragma region Events
static void window_editor_inventions_list_close(rct_window *w);
static void window_editor_inventions_list_mouseup(rct_window *w, sint32 widgetIndex);
static void window_editor_inventions_list_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_inventions_list_update(rct_window *w);
static void window_editor_inventions_list_scrollgetheight(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_editor_inventions_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_editor_inventions_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_editor_inventions_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_editor_inventions_list_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId);
static void window_editor_inventions_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_editor_inventions_list_cursor(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y, sint32 *cursorId);
static void window_editor_inventions_list_invalidate(rct_window *w);
static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
static void window_editor_inventions_list_drag_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId);
static void window_editor_inventions_list_drag_cursor(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y, sint32 *cursorId);
static void window_editor_inventions_list_drag_moved(rct_window* w, sint32 x, sint32 y);
static void window_editor_inventions_list_drag_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -502,7 +502,7 @@ static rct_research_item *get_research_item_at(sint32 x, sint32 y)
{
rct_window *w = window_find_by_class(WC_EDITOR_INVENTION_LIST);
if (w != NULL && w->x <= x && w->y < y && w->x + w->width > x && w->y + w->height > y) {
sint16 widgetIndex = window_find_widget_from_point(w, x, y);
rct_widgetindex widgetIndex = window_find_widget_from_point(w, x, y);
rct_widget *widget = &w->widgets[widgetIndex];
if (widgetIndex == WIDX_PRE_RESEARCHED_SCROLL || widgetIndex == WIDX_RESEARCH_ORDER_SCROLL) {
gPressedWidget.widget_index = widgetIndex;
@ -575,7 +575,7 @@ static void window_editor_inventions_list_close(rct_window *w)
*
* rct2: 0x0068521B
*/
static void window_editor_inventions_list_mouseup(rct_window *w, sint32 widgetIndex)
static void window_editor_inventions_list_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -680,7 +680,7 @@ static void window_editor_inventions_list_scrollmouseover(rct_window *w, sint32
*
* rct2: 0x0068526B
*/
static void window_editor_inventions_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_editor_inventions_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
@ -689,7 +689,7 @@ static void window_editor_inventions_list_tooltip(rct_window* w, sint32 widgetIn
*
* rct2: 0x00685291
*/
static void window_editor_inventions_list_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId)
static void window_editor_inventions_list_cursor(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y, sint32 *cursorId)
{
rct_research_item *researchItem;
sint32 scrollIndex;
@ -942,7 +942,7 @@ static void window_editor_inventions_list_drag_open(rct_research_item *researchI
*
* rct2: 0x0068549C
*/
static void window_editor_inventions_list_drag_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId)
static void window_editor_inventions_list_drag_cursor(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y, sint32 *cursorId)
{
rct_window *inventionListWindow = window_find_by_class(WC_EDITOR_INVENTION_LIST);
if (inventionListWindow != NULL) {

22
src/openrct2/windows/editor_object_selection.c
View File

@ -186,19 +186,19 @@ static rct_widget window_editor_object_selection_widgets[] = {
#pragma region Events
static void window_editor_object_selection_close(rct_window *w);
static void window_editor_object_selection_mouseup(rct_window *w, sint32 widgetIndex);
static void window_editor_object_selection_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_object_selection_resize(rct_window *w);
static void window_editor_object_selection_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_editor_object_selection_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_editor_object_selection_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_editor_object_selection_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_editor_object_selection_update(rct_window *w);
static void window_editor_object_selection_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_editor_object_selection_scroll_mousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_editor_object_selection_scroll_mouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_editor_object_selection_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_editor_object_selection_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_editor_object_selection_invalidate(rct_window *w);
static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
static void window_editor_object_selection_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_editor_object_selection_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static rct_window_event_list window_editor_object_selection_events = {
window_editor_object_selection_close,
@ -785,7 +785,7 @@ static void window_editor_object_selection_close(rct_window *w)
*
* rct2: 0x006AAFAB
*/
static void window_editor_object_selection_mouseup(rct_window *w, sint32 widgetIndex)
static void window_editor_object_selection_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -895,7 +895,7 @@ static void window_editor_object_selection_resize(rct_window *w)
window_set_resize(w, 600, 400, 1200, 1000);
}
void window_editor_object_selection_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
void window_editor_object_selection_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
sint32 num_items;
@ -943,7 +943,7 @@ void window_editor_object_selection_mousedown(sint32 widgetIndex, rct_window*w,
}
}
static void window_editor_object_selection_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_editor_object_selection_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -1081,7 +1081,7 @@ static void window_editor_object_selection_scroll_mouseover(rct_window *w, sint3
*
* rct2: 0x006AB058
*/
static void window_editor_object_selection_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_editor_object_selection_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
switch (widgetIndex) {
case WIDX_TAB_1:
@ -1762,7 +1762,7 @@ static void window_editor_object_selection_update(rct_window *w)
widget_invalidate(w, WIDX_FILTER_STRING_BUTTON);
}
for (sint32 i = WIDX_FILTER_RIDE_TAB_TRANSPORT; i <= WIDX_FILTER_RIDE_TAB_STALL; i++) {
for (rct_widgetindex i = WIDX_FILTER_RIDE_TAB_TRANSPORT; i <= WIDX_FILTER_RIDE_TAB_STALL; i++) {
if (!(w->pressed_widgets & (1ULL << i)))
continue;
@ -1775,7 +1775,7 @@ static void window_editor_object_selection_update(rct_window *w)
}
}
static void window_editor_object_selection_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_editor_object_selection_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex != WIDX_FILTER_STRING_BUTTON || text == NULL)
return;

20
src/openrct2/windows/editor_objective_options.c
View File

@ -129,16 +129,16 @@ static rct_widget *window_editor_objective_options_widgets[] = {
#pragma region Events
static void window_editor_objective_options_main_mouseup(rct_window *w, sint32 widgetIndex);
static void window_editor_objective_options_main_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_objective_options_main_resize(rct_window *w);
static void window_editor_objective_options_main_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_editor_objective_options_main_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_editor_objective_options_main_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_editor_objective_options_main_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_editor_objective_options_main_update(rct_window *w);
static void window_editor_objective_options_main_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_editor_objective_options_main_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_editor_objective_options_main_invalidate(rct_window *w);
static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_objective_options_rides_mouseup(rct_window *w, sint32 widgetIndex);
static void window_editor_objective_options_rides_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_objective_options_rides_resize(rct_window *w);
static void window_editor_objective_options_rides_update(rct_window *w);
static void window_editor_objective_options_rides_scrollgetheight(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
@ -407,7 +407,7 @@ static void window_editor_objective_options_set_objective(rct_window *w, sint32
*
* rct2: 0x006719CA
*/
static void window_editor_objective_options_main_mouseup(rct_window *w, sint32 widgetIndex)
static void window_editor_objective_options_main_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -686,7 +686,7 @@ static void window_editor_objective_options_arg_2_decrease(rct_window *w)
*
* rct2: 0x00671A0D
*/
static void window_editor_objective_options_main_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_editor_objective_options_main_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
switch (widgetIndex) {
case WIDX_OBJECTIVE_DROPDOWN:
@ -717,7 +717,7 @@ static void window_editor_objective_options_main_mousedown(sint32 widgetIndex, r
*
* rct2: 0x00671A54
*/
static void window_editor_objective_options_main_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_editor_objective_options_main_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
uint8 newObjectiveType;
@ -786,7 +786,7 @@ static void window_editor_objective_options_main_update(rct_window *w)
*
* rct2: 0x00671A73
*/
static void window_editor_objective_options_main_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_editor_objective_options_main_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (text == NULL)
return;
@ -1058,7 +1058,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi
*
* rct2: 0x006724A4
*/
static void window_editor_objective_options_rides_mouseup(rct_window *w, sint32 widgetIndex)
static void window_editor_objective_options_rides_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:

28
src/openrct2/windows/editor_scenario_options.c
View File

@ -182,24 +182,24 @@ static rct_widget *window_editor_scenario_options_widgets[] = {
#pragma region Events
static void window_editor_scenario_options_financial_mouseup(rct_window *w, sint32 widgetIndex);
static void window_editor_scenario_options_financial_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_scenario_options_financial_resize(rct_window *w);
static void window_editor_scenario_options_financial_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_editor_scenario_options_financial_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_editor_scenario_options_financial_update(rct_window *w);
static void window_editor_scenario_options_financial_invalidate(rct_window *w);
static void window_editor_scenario_options_financial_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_scenario_options_guests_mouseup(rct_window *w, sint32 widgetIndex);
static void window_editor_scenario_options_guests_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_scenario_options_guests_resize(rct_window *w);
static void window_editor_scenario_options_guests_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_editor_scenario_options_guests_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_editor_scenario_options_guests_update(rct_window *w);
static void window_editor_scenario_options_guests_invalidate(rct_window *w);
static void window_editor_scenario_options_guests_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_editor_scenario_options_park_mouseup(rct_window *w, sint32 widgetIndex);
static void window_editor_scenario_options_park_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_editor_scenario_options_park_resize(rct_window *w);
static void window_editor_scenario_options_park_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_editor_scenario_options_park_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_editor_scenario_options_park_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_editor_scenario_options_park_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_editor_scenario_options_park_update(rct_window *w);
static void window_editor_scenario_options_park_invalidate(rct_window *w);
static void window_editor_scenario_options_park_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -488,7 +488,7 @@ static void window_editor_scenario_options_set_page(rct_window *w, sint32 page)
*
* rct2: 0x0067049D
*/
static void window_editor_scenario_options_financial_mouseup(rct_window *w, sint32 widgetIndex)
static void window_editor_scenario_options_financial_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -539,7 +539,7 @@ static void window_editor_scenario_options_financial_resize(rct_window *w)
*
* rct2: 0x006704C8
*/
static void window_editor_scenario_options_financial_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_editor_scenario_options_financial_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
switch (widgetIndex) {
case WIDX_INITIAL_CASH_INCREASE:
@ -823,7 +823,7 @@ static void window_editor_scenario_options_financial_paint(rct_window *w, rct_dr
*
* rct2: 0x00670A62
*/
static void window_editor_scenario_options_guests_mouseup(rct_window *w, sint32 widgetIndex)
static void window_editor_scenario_options_guests_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -874,7 +874,7 @@ static void window_editor_scenario_options_guests_resize(rct_window *w)
*
* rct2: 0x00670A89
*/
static void window_editor_scenario_options_guests_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_editor_scenario_options_guests_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
switch (widgetIndex) {
case WIDX_CASH_PER_GUEST_INCREASE:
@ -1131,7 +1131,7 @@ static void window_editor_scenario_options_guests_paint(rct_window *w, rct_drawp
*
* rct2: 0x00670FD8
*/
static void window_editor_scenario_options_park_mouseup(rct_window *w, sint32 widgetIndex)
static void window_editor_scenario_options_park_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -1218,7 +1218,7 @@ static void window_editor_scenario_options_park_resize(rct_window *w)
*
* rct2: 0x00671019
*/
static void window_editor_scenario_options_park_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_editor_scenario_options_park_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
rct_widget *dropdownWidget;
@ -1347,7 +1347,7 @@ static void window_editor_scenario_options_park_mousedown(sint32 widgetIndex, rc
*
* rct2: 0x00671060
*/
static void window_editor_scenario_options_park_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_editor_scenario_options_park_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex == WIDX_PAY_FOR_PARK_OR_RIDES_DROPDOWN && dropdownIndex != -1) {
game_do_command(

38
src/openrct2/windows/finances.c
View File

@ -198,35 +198,35 @@ static rct_widget *window_finances_page_widgets[] = {
#pragma region Events
static void window_finances_summary_mouseup(rct_window *w, sint32 widgetIndex);
static void window_finances_summary_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_finances_summary_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_summary_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_finances_summary_update(rct_window *w);
static void window_finances_summary_invalidate(rct_window *w);
static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_financial_graph_mouseup(rct_window *w, sint32 widgetIndex);
static void window_finances_financial_graph_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_financial_graph_update(rct_window *w);
static void window_finances_financial_graph_invalidate(rct_window *w);
static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_park_value_graph_mouseup(rct_window *w, sint32 widgetIndex);
static void window_finances_park_value_graph_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_park_value_graph_update(rct_window *w);
static void window_finances_park_value_graph_invalidate(rct_window *w);
static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_profit_graph_mouseup(rct_window *w, sint32 widgetIndex);
static void window_finances_profit_graph_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_profit_graph_update(rct_window *w);
static void window_finances_profit_graph_invalidate(rct_window *w);
static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_marketing_mouseup(rct_window *w, sint32 widgetIndex);
static void window_finances_marketing_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_marketing_update(rct_window *w);
static void window_finances_marketing_invalidate(rct_window *w);
static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_finances_research_mouseup(rct_window *w, sint32 widgetIndex);
static void window_finances_research_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_finances_research_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_finances_research_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_finances_research_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_finances_research_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_finances_research_update(rct_window *w);
static void window_finances_research_invalidate(rct_window *w);
static void window_finances_research_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -594,7 +594,7 @@ void window_finances_research_open()
*
* rct2: 0x0069CA99
*/
static void window_finances_summary_mouseup(rct_window *w, sint32 widgetIndex)
static void window_finances_summary_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
@ -606,7 +606,7 @@ static void window_finances_summary_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x0069CAB0
*/
static void window_finances_summary_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_finances_summary_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
money32 newLoan;
@ -774,7 +774,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
*
* rct2: 0x0069CF70
*/
static void window_finances_financial_graph_mouseup(rct_window *w, sint32 widgetIndex)
static void window_finances_financial_graph_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
@ -884,7 +884,7 @@ static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelin
*
* rct2: 0x0069D338
*/
static void window_finances_park_value_graph_mouseup(rct_window *w, sint32 widgetIndex)
static void window_finances_park_value_graph_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
@ -990,7 +990,7 @@ static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixeli
*
* rct2: 0x0069D715
*/
static void window_finances_profit_graph_mouseup(rct_window *w, sint32 widgetIndex)
static void window_finances_profit_graph_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
@ -1096,7 +1096,7 @@ static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo
*
* rct2: 0x0069D9F9
*/
static void window_finances_marketing_mouseup(rct_window *w, sint32 widgetIndex)
static void window_finances_marketing_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
@ -1245,7 +1245,7 @@ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dp
*
* rct2: 0x0069DB3F
*/
static void window_finances_research_mouseup(rct_window *w, sint32 widgetIndex)
static void window_finances_research_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
sint32 activeResearchTypes;
@ -1279,7 +1279,7 @@ static void window_finances_research_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x0069DB66
*/
static void window_finances_research_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_finances_research_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
rct_widget *dropdownWidget;
sint32 i;
@ -1312,7 +1312,7 @@ static void window_finances_research_mousedown(sint32 widgetIndex, rct_window *w
*
* rct2: 0x0069DB6D
*/
static void window_finances_research_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_finances_research_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON || dropdownIndex == -1)
return;
@ -1439,7 +1439,7 @@ static void window_finances_set_pressed_tab(rct_window *w)
static void window_finances_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex)
{
sint32 widgetIndex = WIDX_TAB_1 + page;
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
if (!(w->disabled_widgets & (1LL << widgetIndex))) {
if (w->page == page) {

28
src/openrct2/windows/footpath.c
View File

@ -97,14 +97,14 @@ static rct_widget window_footpath_widgets[] = {
};
static void window_footpath_close(rct_window *w);
static void window_footpath_mouseup(rct_window *w, sint32 widgetIndex);
static void window_footpath_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_footpath_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_footpath_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_footpath_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_footpath_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_footpath_update(rct_window *w);
static void window_footpath_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_footpath_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_footpath_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_footpath_toolup(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_footpath_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_footpath_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_footpath_tooldrag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_footpath_toolup(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_footpath_invalidate(rct_window *w);
static void window_footpath_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -285,7 +285,7 @@ static void window_footpath_close(rct_window *w)
*
* rct2: 0x006A7E92
*/
static void window_footpath_mouseup(rct_window *w, sint32 widgetIndex)
static void window_footpath_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -334,7 +334,7 @@ static void window_footpath_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x006A7EC5
*/
static void window_footpath_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_footpath_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
switch (widgetIndex) {
case WIDX_FOOTPATH_TYPE:
@ -371,7 +371,7 @@ static void window_footpath_mousedown(sint32 widgetIndex, rct_window*w, rct_widg
*
* rct2: 0x006A7F18
*/
static void window_footpath_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_footpath_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex == WIDX_FOOTPATH_TYPE)
gFootpathSelectedType = SELECTED_PATH_TYPE_NORMAL;
@ -418,7 +418,7 @@ static void window_footpath_dropdown(rct_window *w, sint32 widgetIndex, sint32 d
*
* rct2: 0x006A8032
*/
static void window_footpath_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_footpath_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND) {
window_footpath_set_provisional_path_at_point(x, y);
@ -431,7 +431,7 @@ static void window_footpath_toolupdate(rct_window* w, sint32 widgetIndex, sint32
*
* rct2: 0x006A8047
*/
static void window_footpath_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_footpath_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND)
window_footpath_place_path_at_point(x, y);
@ -443,7 +443,7 @@ static void window_footpath_tooldown(rct_window* w, sint32 widgetIndex, sint32 x
*
* rct2: 0x006A8067
*/
static void window_footpath_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_footpath_tooldrag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND) {
window_footpath_place_path_at_point(x, y);
@ -454,7 +454,7 @@ static void window_footpath_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x
*
* rct2: 0x006A8066
*/
static void window_footpath_toolup(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_footpath_toolup(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND) {
_footpathErrorOccured = false;

12
src/openrct2/windows/game_bottom_toolbar.c
View File

@ -72,12 +72,12 @@ rct_widget window_game_bottom_toolbar_widgets[] = {
{ WIDGETS_END },
};
static void window_game_bottom_toolbar_mouseup(rct_window *w, sint32 widgetIndex);
static void window_game_bottom_toolbar_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_game_bottom_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_game_bottom_toolbar_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_game_bottom_toolbar_invalidate(rct_window *w);
static void window_game_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_game_bottom_toolbar_update(rct_window* w);
static void window_game_bottom_toolbar_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId);
static void window_game_bottom_toolbar_cursor(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y, sint32 *cursorId);
static void window_game_bottom_toolbar_unknown05(rct_window *w);
static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, rct_window *w);
@ -162,7 +162,7 @@ void window_game_bottom_toolbar_open()
*
* rct2: 0x0066C588
*/
static void window_game_bottom_toolbar_mouseup(rct_window *w, sint32 widgetIndex)
static void window_game_bottom_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
NewsItem *newsItem;
@ -211,7 +211,7 @@ static void window_game_bottom_toolbar_mouseup(rct_window *w, sint32 widgetIndex
}
}
static void window_game_bottom_toolbar_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_game_bottom_toolbar_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
sint32 month, day;
@ -620,7 +620,7 @@ static void window_game_bottom_toolbar_update(rct_window* w){
*
* rct2: 0x0066C644
*/
static void window_game_bottom_toolbar_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId)
static void window_game_bottom_toolbar_cursor(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y, sint32 *cursorId)
{
switch (widgetIndex) {
case WIDX_MONEY:

28
src/openrct2/windows/guest.c
View File

@ -179,17 +179,17 @@ void window_guest_viewport_init(rct_window* w);
void window_guest_overview_close(rct_window *w);
void window_guest_overview_resize(rct_window *w);
void window_guest_overview_mouse_up(rct_window *w, sint32 widgetIndex);
void window_guest_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
void window_guest_overview_invalidate(rct_window *w);
void window_guest_overview_unknown_14(rct_window *w);
void window_guest_overview_update(rct_window* w);
void window_guest_overview_text_input(rct_window *w, sint32 widgetIndex, char *text);
void window_guest_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
void window_guest_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
void window_guest_overview_tool_abort(rct_window *w, sint32 widgetIndex);
void window_guest_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_guest_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex);
void window_guest_mouse_up(rct_window *w, sint32 widgetIndex);
void window_guest_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
void window_guest_unknown_05(rct_window *w);
void window_guest_stats_resize(rct_window *w);
@ -199,7 +199,7 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi);
void window_guest_rides_resize(rct_window *w);
void window_guest_rides_update(rct_window *w);
void window_guest_rides_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
void window_guest_rides_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
void window_guest_rides_scroll_get_size(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
void window_guest_rides_scroll_mouse_down(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
void window_guest_rides_scroll_mouse_over(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
@ -617,7 +617,7 @@ void game_command_callback_pickup_guest(sint32 eax, sint32 ebx, sint32 ecx, sint
*
* rct2: 0x00696A06
*/
void window_guest_overview_mouse_up(rct_window *w, sint32 widgetIndex)
void window_guest_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex)
{
rct_peep* peep = GET_PEEP(w->number);
@ -1148,7 +1148,7 @@ void window_guest_overview_update(rct_window* w){
}
/* rct2: 0x696A6A */
void window_guest_overview_text_input(rct_window *w, sint32 widgetIndex, char *text)
void window_guest_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex != WIDX_RENAME)
return;
@ -1166,7 +1166,7 @@ void window_guest_overview_text_input(rct_window *w, sint32 widgetIndex, char *t
*
* rct2: 0x696A5F
*/
void window_guest_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -1217,7 +1217,7 @@ void window_guest_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32
*
* rct2: 0x696A54
*/
void window_guest_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -1237,7 +1237,7 @@ void window_guest_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x
*
* rct2: 0x696A49
*/
void window_guest_overview_tool_abort(rct_window *w, sint32 widgetIndex)
void window_guest_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -1249,7 +1249,7 @@ void window_guest_overview_tool_abort(rct_window *w, sint32 widgetIndex)
* This is a combination of 5 functions that were identical
* rct2: 0x69744F, 0x697795, 0x697BDD, 0x697E18, 0x698279
*/
void window_guest_mouse_up(rct_window *w, sint32 widgetIndex)
void window_guest_mouse_up(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex){
case WIDX_CLOSE:
@ -1566,7 +1566,7 @@ void window_guest_rides_update(rct_window *w)
*
* rct2: 0x697844
*/
void window_guest_rides_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
void window_guest_rides_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}

16
src/openrct2/windows/guest_list.c
View File

@ -89,15 +89,15 @@ static rct_widget window_guest_list_widgets[] = {
{ WIDGETS_END },
};
static void window_guest_list_mouseup(rct_window *w, sint32 widgetIndex);
static void window_guest_list_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_guest_list_resize(rct_window *w);
static void window_guest_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_guest_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_guest_list_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_guest_list_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_guest_list_update(rct_window *w);
static void window_guest_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_guest_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_guest_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_guest_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_guest_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_guest_list_invalidate(rct_window *w);
static void window_guest_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -305,7 +305,7 @@ void window_guest_list_open_with_filter(sint32 type, sint32 index)
*
* rct2: 0x00699AAF
*/
static void window_guest_list_mouseup(rct_window *w, sint32 widgetIndex)
static void window_guest_list_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -348,7 +348,7 @@ static void window_guest_list_resize(rct_window *w)
*
* rct2: 0x00699AC4
*/
static void window_guest_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_guest_list_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
sint32 i;
switch (widgetIndex) {
@ -418,7 +418,7 @@ static void window_guest_list_mousedown(sint32 widgetIndex, rct_window*w, rct_wi
*
* rct2: 0x00699AE1
*/
static void window_guest_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_guest_list_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
switch (widgetIndex) {
case WIDX_PAGE_DROPDOWN_BUTTON:
@ -585,7 +585,7 @@ static void window_guest_list_scrollmouseover(rct_window *w, sint32 scrollIndex,
*
* rct2: 0x00699E4A
*/
static void window_guest_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_guest_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}

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

@ -54,10 +54,10 @@ static rct_widget window_install_track_widgets[] = {
};
static void window_install_track_close(rct_window *w);
static void window_install_track_mouseup(rct_window *w, sint32 widgetIndex);
static void window_install_track_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_install_track_invalidate(rct_window *w);
static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_install_track_text_input(rct_window *w, sint32 widgetIndex, char *text);
static void window_install_track_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
static rct_window_event_list window_install_track_events = {
window_install_track_close,
@ -161,7 +161,7 @@ static void window_install_track_close(rct_window *w)
*
* rct2: 0x006D407A
*/
static void window_install_track_mouseup(rct_window *w, sint32 widgetIndex)
static void window_install_track_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -358,7 +358,7 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi)
*
* rct2: 0x006D40A7
*/
static void window_install_track_text_input(rct_window *w, sint32 widgetIndex, char *text)
static void window_install_track_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex != WIDX_INSTALL || str_is_null_or_empty(text)) {
return;

16
src/openrct2/windows/land.c
View File

@ -60,13 +60,13 @@ static rct_widget window_land_widgets[] = {
};
static void window_land_close(rct_window *w);
static void window_land_mouseup(rct_window *w, sint32 widgetIndex);
static void window_land_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_land_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_land_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_land_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_land_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_land_update(rct_window *w);
static void window_land_invalidate(rct_window *w);
static void window_land_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_land_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_land_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_land_inputsize(rct_window *w);
static rct_window_event_list window_land_events = {
@ -166,7 +166,7 @@ static void window_land_close(rct_window *w)
*
* rct2: 0x00664064
*/
static void window_land_mouseup(rct_window *w, sint32 widgetIndex)
static void window_land_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -206,7 +206,7 @@ static void window_land_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x0066407B
*/
static void window_land_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_land_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
sint32 i;
sint32 defaultIndex = -1;
@ -257,7 +257,7 @@ static void window_land_mousedown(sint32 widgetIndex, rct_window*w, rct_widget*
*
* rct2: 0x00664090
*/
static void window_land_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_land_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
sint32 type;
@ -297,7 +297,7 @@ static void window_land_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropd
}
}
static void window_land_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_land_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
sint32 size;
char* end;

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

@ -54,11 +54,11 @@ static rct_widget window_land_rights_widgets[] = {
};
static void window_land_rights_close(rct_window *w);
static void window_land_rights_mouseup(rct_window *w, sint32 widgetIndex);
static void window_land_rights_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_land_rights_update(rct_window *w);
static void window_land_rights_invalidate(rct_window *w);
static void window_land_rights_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_land_rights_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_land_rights_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_land_rights_inputsize(rct_window *w);
static rct_window_event_list window_land_rights_events = {
@ -123,7 +123,7 @@ static void window_land_rights_close(rct_window *w)
tool_cancel();
}
static void window_land_rights_mouseup(rct_window *w, sint32 widgetIndex)
static void window_land_rights_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -165,7 +165,7 @@ static void window_land_rights_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_land_rights_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_land_rights_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
sint32 size;
char* end;

16
src/openrct2/windows/loadsave.c
View File

@ -69,12 +69,12 @@ static rct_widget window_loadsave_widgets[] = {
#pragma region Events
static void window_loadsave_close(rct_window *w);
static void window_loadsave_mouseup(rct_window *w, sint32 widgetIndex);
static void window_loadsave_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_loadsave_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_loadsave_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_loadsave_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_loadsave_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_loadsave_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_loadsave_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_loadsave_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_loadsave_invalidate(rct_window *w);
static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -292,7 +292,7 @@ static bool browse(bool isSave, char *path, size_t pathSize)
return platform_open_common_file_dialog(path, &desc, pathSize);
}
static void window_loadsave_mouseup(rct_window *w, sint32 widgetIndex)
static void window_loadsave_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
char path[MAX_PATH];
@ -410,7 +410,7 @@ static void window_loadsave_scrollmouseover(rct_window *w, sint32 scrollIndex, s
window_invalidate(w);
}
static void window_loadsave_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_loadsave_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
char path[MAX_PATH];
sint32 i, overwrite;
@ -464,7 +464,7 @@ static void window_loadsave_textinput(rct_window *w, sint32 widgetIndex, char *t
}
static void window_loadsave_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_loadsave_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
@ -857,7 +857,7 @@ static rct_widget window_overwrite_prompt_widgets[] = {
{ WIDGETS_END }
};
static void window_overwrite_prompt_mouseup(rct_window *w, sint32 widgetIndex);
static void window_overwrite_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_overwrite_prompt_invalidate(rct_window *w);
static void window_overwrite_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -914,7 +914,7 @@ static rct_window *window_overwrite_prompt_open(const char *name, const char *pa
return w;
}
static void window_overwrite_prompt_mouseup(rct_window *w, sint32 widgetIndex)
static void window_overwrite_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_window *loadsaveWindow;

32
src/openrct2/windows/map.c
View File

@ -120,17 +120,17 @@ static const uint16 RideKeyColours[] = {
static void window_map_close(rct_window *w);
static void window_map_resize(rct_window *w);
static void window_map_mouseup(rct_window *w, sint32 widgetIndex);
static void window_map_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_map_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_map_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_map_update(rct_window *w);
static void window_map_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_map_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_map_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_map_toolabort(rct_window *w, sint32 widgetIndex);
static void window_map_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_map_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_map_tooldrag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_map_toolabort(rct_window *w, rct_widgetindex widgetIndex);
static void window_map_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_map_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_map_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_map_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_map_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_map_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_map_invalidate(rct_window *w);
static void window_map_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -290,7 +290,7 @@ static void window_map_close(rct_window *w)
*
* rct2: 0x0068CFC1
*/
static void window_map_mouseup(rct_window *w, sint32 widgetIndex)
static void window_map_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -412,7 +412,7 @@ static void window_map_resize(rct_window *w)
*
* rct2: 0x0068D040
*/
static void window_map_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_map_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
switch (widgetIndex) {
case WIDX_MAP_SIZE_SPINNER_UP:
@ -461,7 +461,7 @@ static void window_map_update(rct_window *w)
*
* rct2: 0x0068D093
*/
static void window_map_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_map_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex) {
case WIDX_SET_LAND_RIGHTS:
@ -480,7 +480,7 @@ static void window_map_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, s
*
* rct2: 0x0068D074
*/
static void window_map_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_map_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex) {
case WIDX_BUILD_PARK_ENTRANCE:
@ -496,7 +496,7 @@ static void window_map_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sin
*
* rct2: 0x0068D088
*/
static void window_map_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_map_tooldrag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex) {
case WIDX_SET_LAND_RIGHTS:
@ -520,7 +520,7 @@ static void window_map_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sin
*
* rct2: 0x0068D055
*/
static void window_map_toolabort(rct_window *w, sint32 widgetIndex)
static void window_map_toolabort(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_SET_LAND_RIGHTS:
@ -633,7 +633,7 @@ static void window_map_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32
}
}
static void window_map_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_map_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
sint32 size;
char* end;
@ -676,7 +676,7 @@ static void window_map_textinput(rct_window *w, sint32 widgetIndex, char *text)
*
* rct2: 0x0068D140
*/
static void window_map_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_map_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_MAP);
}

52
src/openrct2/windows/mapgen.c
View File

@ -228,31 +228,31 @@ static rct_widget *PageWidgets[WINDOW_MAPGEN_PAGE_COUNT] = {
#pragma region Events
static void window_mapgen_shared_close(rct_window *w);
static void window_mapgen_shared_mouseup(rct_window *w, sint32 widgetIndex);
static void window_mapgen_shared_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_mapgen_base_mouseup(rct_window *w, sint32 widgetIndex);
static void window_mapgen_base_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget);
static void window_mapgen_base_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_mapgen_base_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_mapgen_base_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget);
static void window_mapgen_base_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_mapgen_base_update(rct_window *w);
static void window_mapgen_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_mapgen_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_mapgen_base_invalidate(rct_window *w);
static void window_mapgen_base_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_mapgen_random_mouseup(rct_window *w, sint32 widgetIndex);
static void window_mapgen_random_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_mapgen_random_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_mapgen_random_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_mapgen_random_update(rct_window *w);
static void window_mapgen_random_invalidate(rct_window *w);
static void window_mapgen_random_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_mapgen_simplex_mouseup(rct_window *w, sint32 widgetIndex);
static void window_mapgen_simplex_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget);
static void window_mapgen_simplex_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_mapgen_simplex_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_mapgen_simplex_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget);
static void window_mapgen_simplex_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_mapgen_simplex_update(rct_window *w);
static void window_mapgen_simplex_invalidate(rct_window *w);
static void window_mapgen_simplex_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_mapgen_heightmap_mouseup(rct_window *w, sint32 widgetIndex);
static void window_mapgen_heightmap_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget);
static void window_mapgen_heightmap_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_mapgen_heightmap_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget);
static void window_mapgen_heightmap_invalidate(rct_window *w);
static void window_mapgen_heightmap_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -616,7 +616,7 @@ static void window_mapgen_shared_close(rct_window *w)
mapgen_unload_heightmap();
}
static void window_mapgen_shared_mouseup(rct_window *w, sint32 widgetIndex)
static void window_mapgen_shared_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
@ -634,7 +634,7 @@ static void window_mapgen_shared_mouseup(rct_window *w, sint32 widgetIndex)
#pragma region Base page
static void window_mapgen_base_mouseup(rct_window *w, sint32 widgetIndex)
static void window_mapgen_base_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
@ -670,7 +670,7 @@ static void window_mapgen_base_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_mapgen_base_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_mapgen_base_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
sint32 i;
sint32 defaultIndex = -1;
@ -738,7 +738,7 @@ static void window_mapgen_base_mousedown(sint32 widgetIndex, rct_window *w, rct_
}
}
static void window_mapgen_base_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_mapgen_base_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
sint32 type;
@ -786,7 +786,7 @@ static void window_mapgen_base_update(rct_window *w)
widget_invalidate(w, WIDX_TAB_1);
}
static void window_mapgen_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_mapgen_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
sint32 value;
char* end;
@ -863,7 +863,7 @@ static void window_mapgen_base_paint(rct_window *w, rct_drawpixelinfo *dpi)
#pragma region Random page
static void window_mapgen_random_mouseup(rct_window *w, sint32 widgetIndex)
static void window_mapgen_random_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
@ -895,7 +895,7 @@ static void window_mapgen_random_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_mapgen_random_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_mapgen_random_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
}
@ -936,7 +936,7 @@ static void window_mapgen_random_paint(rct_window *w, rct_drawpixelinfo *dpi)
#pragma region Simplex page
static void window_mapgen_simplex_mouseup(rct_window *w, sint32 widgetIndex)
static void window_mapgen_simplex_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
@ -969,7 +969,7 @@ static void window_mapgen_simplex_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_mapgen_simplex_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_mapgen_simplex_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
sint32 i;
sint32 defaultIndex = -1;
@ -1061,7 +1061,7 @@ static void window_mapgen_simplex_mousedown(sint32 widgetIndex, rct_window *w, r
}
}
static void window_mapgen_simplex_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_mapgen_simplex_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
sint32 type;
@ -1159,7 +1159,7 @@ static void window_mapgen_simplex_paint(rct_window *w, rct_drawpixelinfo *dpi)
#pragma region Heightmap page
static void window_mapgen_heightmap_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_mapgen_heightmap_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
switch (widgetIndex)
{
@ -1231,7 +1231,7 @@ static void window_mapgen_heightmap_loadsave_callback(sint32 result, const utf8
}
}
static void window_mapgen_heightmap_mouseup(rct_window *w, sint32 widgetIndex)
static void window_mapgen_heightmap_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
window_mapgen_shared_mouseup(w, widgetIndex);
@ -1265,7 +1265,7 @@ static void window_mapgen_heightmap_mouseup(rct_window *w, sint32 widgetIndex)
break;
case WIDX_HEIGHTMAP_SMOOTH_TILES:
_heightmapSmoothTiles = !_heightmapSmoothTiles;
widget_set_checkbox_value(w, _heightmapSmoothTiles, _heightmapSmoothTiles);
widget_set_checkbox_value(w, WIDX_HEIGHTMAP_SMOOTH_TILES, _heightmapSmoothTiles);
widget_invalidate(w, WIDX_HEIGHTMAP_SMOOTH_TILES);
break;
}
@ -1376,7 +1376,7 @@ static void window_mapgen_set_pressed_tab(rct_window *w)
static void window_mapgen_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex)
{
sint32 widgetIndex = WIDX_TAB_1 + page;
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
if (!(w->disabled_widgets & (1LL << widgetIndex))) {
if (w->page == page) {

20
src/openrct2/windows/maze_construction.c
View File

@ -88,12 +88,12 @@ static rct_widget window_maze_construction_widgets[] = {
#pragma region Events
static void window_maze_construction_close(rct_window *w);
static void window_maze_construction_mouseup(rct_window *w, sint32 widgetIndex);
static void window_maze_construction_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_maze_construction_resize(rct_window *w);
static void window_maze_construction_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_maze_construction_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_maze_construction_update(rct_window *w);
static void window_maze_construction_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_maze_construction_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_maze_construction_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_maze_construction_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_maze_construction_invalidate(rct_window *w);
static void window_maze_construction_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -192,7 +192,7 @@ static void window_maze_construction_close(rct_window *w)
}
}
static void window_maze_construction_entrance_mouseup(rct_window *w, sint32 widgetIndex){
static void window_maze_construction_entrance_mouseup(rct_window *w, rct_widgetindex widgetIndex){
if (tool_set(w, widgetIndex, TOOL_CROSSHAIR))
return;
@ -215,7 +215,7 @@ static void window_maze_construction_entrance_mouseup(rct_window *w, sint32 widg
*
* rct2: 0x006CD461
*/
static void window_maze_construction_mouseup(rct_window *w, sint32 widgetIndex)
static void window_maze_construction_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex){
case WIDX_CLOSE:
@ -260,7 +260,7 @@ static void window_maze_construction_resize(rct_window *w)
if (currentDisabledWidgets == disabledWidgets)
return;
for (sint32 i = 0; i < 64; i++) {
for (rct_widgetindex i = 0; i < 64; i++) {
if ((disabledWidgets & (1ULL << i)) != (currentDisabledWidgets & (1ULL << i))) {
widget_invalidate(w, i);
}
@ -272,7 +272,7 @@ static void window_maze_construction_resize(rct_window *w)
*
* rct2: 0x006CD48C
*/
static void window_maze_construction_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_maze_construction_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
switch (widgetIndex) {
case WIDX_MAZE_BUILD_MODE:
@ -336,7 +336,7 @@ static void window_maze_construction_update(rct_window *w)
*
* rct2: 0x006CD63E
*/
static void window_maze_construction_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_maze_construction_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex){
case WIDX_MAZE_DIRECTION_GROUPBOX:
@ -410,7 +410,7 @@ static void window_maze_construction_entrance_tooldown(sint32 x, sint32 y, rct_w
*
* rct2: 0x006CD65D
*/
static void window_maze_construction_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_maze_construction_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex){
case WIDX_MAZE_DIRECTION_GROUPBOX:

30
src/openrct2/windows/multiplayer.c
View File

@ -113,13 +113,13 @@ const uint64 window_multiplayer_page_enabled_widgets[] = {
static uint8 _selectedGroup = 0;
static void window_multiplayer_information_mouseup(rct_window *w, sint32 widgetIndex);
static void window_multiplayer_information_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_multiplayer_information_resize(rct_window *w);
static void window_multiplayer_information_update(rct_window *w);
static void window_multiplayer_information_invalidate(rct_window *w);
static void window_multiplayer_information_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_multiplayer_players_mouseup(rct_window *w, sint32 widgetIndex);
static void window_multiplayer_players_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_multiplayer_players_resize(rct_window *w);
static void window_multiplayer_players_update(rct_window *w);
static void window_multiplayer_players_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
@ -129,20 +129,20 @@ static void window_multiplayer_players_invalidate(rct_window *w);
static void window_multiplayer_players_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
static void window_multiplayer_groups_mouseup(rct_window *w, sint32 widgetIndex);
static void window_multiplayer_groups_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_multiplayer_groups_resize(rct_window *w);
static void window_multiplayer_groups_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget);
static void window_multiplayer_groups_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_multiplayer_groups_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget);
static void window_multiplayer_groups_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_multiplayer_groups_update(rct_window *w);
static void window_multiplayer_groups_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_multiplayer_groups_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_multiplayer_groups_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_multiplayer_groups_text_input(rct_window *w, sint32 widgetIndex, char *text);
static void window_multiplayer_groups_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_multiplayer_groups_invalidate(rct_window *w);
static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
static void window_multiplayer_options_mouseup(rct_window *w, sint32 widgetIndex);
static void window_multiplayer_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_multiplayer_options_resize(rct_window *w);
static void window_multiplayer_options_update(rct_window *w);
static void window_multiplayer_options_invalidate(rct_window *w);
@ -372,7 +372,7 @@ static void window_multiplayer_groups_show_group_dropdown(rct_window *w, rct_wid
#pragma region Information page
static void window_multiplayer_information_mouseup(rct_window *w, sint32 widgetIndex)
static void window_multiplayer_information_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -482,7 +482,7 @@ static void window_multiplayer_information_paint(rct_window *w, rct_drawpixelinf
#pragma region Players page
static void window_multiplayer_players_mouseup(rct_window *w, sint32 widgetIndex)
static void window_multiplayer_players_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -664,7 +664,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli
#pragma region Groups page
static void window_multiplayer_groups_mouseup(rct_window *w, sint32 widgetIndex)
static void window_multiplayer_groups_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -703,7 +703,7 @@ static void window_multiplayer_groups_resize(rct_window *w)
window_invalidate(w);
}
static void window_multiplayer_groups_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget)
static void window_multiplayer_groups_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget)
{
switch (widgetIndex) {
case WIDX_DEFAULT_GROUP_DROPDOWN:
@ -715,7 +715,7 @@ static void window_multiplayer_groups_mousedown(sint32 widgetIndex, rct_window*
}
}
static void window_multiplayer_groups_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_multiplayer_groups_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1) {
return;
@ -784,7 +784,7 @@ static void window_multiplayer_groups_scrollmouseover(rct_window *w, sint32 scro
window_invalidate(w);
}
static void window_multiplayer_groups_text_input(rct_window *w, sint32 widgetIndex, char *text)
static void window_multiplayer_groups_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex != WIDX_RENAME_GROUP)
return;
@ -905,7 +905,7 @@ static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelin
#pragma region Options page
static void window_multiplayer_options_mouseup(rct_window *w, sint32 widgetIndex)
static void window_multiplayer_options_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -966,7 +966,7 @@ static void window_multiplayer_options_paint(rct_window *w, rct_drawpixelinfo *d
static void window_multiplayer_draw_tab_image(rct_window *w, rct_drawpixelinfo *dpi, sint32 page, sint32 spriteIndex)
{
sint32 widgetIndex = WIDX_TAB1 + page;
rct_widgetindex widgetIndex = WIDX_TAB1 + page;
if (!widget_is_disabled(w, widgetIndex)) {
if (w->page == page) {

4
src/openrct2/windows/music_credits.c
View File

@ -81,7 +81,7 @@ static const rct_string_id music_credits_rct2[] = {
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WHAT_SHALL_WE_DO_WITH_THE_DRUNKEN_SAILOR,
};
static void window_music_credits_mouseup(rct_window *w, sint32 widgetIndex);
static void window_music_credits_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_music_credits_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_music_credits_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -152,7 +152,7 @@ void window_music_credits_open()
*
* rct2: 0x0066DB2C
*/
static void window_music_credits_mouseup(rct_window *w, sint32 widgetIndex)
static void window_music_credits_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:

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

@ -40,9 +40,9 @@ static rct_widget window_network_status_widgets[] = {
static char window_network_status_text[1024];
static void window_network_status_onclose(rct_window *w);
static void window_network_status_mouseup(rct_window *w, sint32 widgetIndex);
static void window_network_status_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_network_status_update(rct_window *w);
static void window_network_status_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_network_status_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_network_status_invalidate(rct_window *w);
static void window_network_status_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -129,7 +129,7 @@ static void window_network_status_onclose(rct_window *w)
}
}
static void window_network_status_mouseup(rct_window *w, sint32 widgetIndex)
static void window_network_status_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -143,7 +143,7 @@ static void window_network_status_update(rct_window *w)
widget_invalidate(w, WIDX_BACKGROUND);
}
static void window_network_status_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_network_status_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
_password[0] = '\0';
switch (widgetIndex) {

12
src/openrct2/windows/new_campaign.c
View File

@ -57,9 +57,9 @@ static rct_widget window_new_campaign_widgets[] = {
};
static void window_new_campaign_mouseup(rct_window *w, sint32 widgetIndex);
static void window_new_campaign_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_new_campaign_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_new_campaign_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_new_campaign_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_new_campaign_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_new_campaign_invalidate(rct_window *w);
static void window_new_campaign_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -218,7 +218,7 @@ static void window_new_campaign_get_shop_items()
*
* rct2: 0x0069E50B
*/
static void window_new_campaign_mouseup(rct_window *w, sint32 widgetIndex)
static void window_new_campaign_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -235,7 +235,7 @@ static void window_new_campaign_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x0069E51C
*/
static void window_new_campaign_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_new_campaign_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
rct_widget *dropdownWidget;
@ -307,7 +307,7 @@ static void window_new_campaign_mousedown(sint32 widgetIndex, rct_window *w, rct
*
* rct2: 0x0069E537
*/
static void window_new_campaign_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_new_campaign_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex != WIDX_RIDE_DROPDOWN_BUTTON)
return;

14
src/openrct2/windows/new_ride.c
View File

@ -201,13 +201,13 @@ static rct_widget window_new_ride_widgets[] = {
#pragma region Events
static void window_new_ride_mouseup(rct_window *w, sint32 widgetIndex);
static void window_new_ride_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_new_ride_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_new_ride_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_new_ride_update(rct_window *w);
static void window_new_ride_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_new_ride_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_new_ride_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_new_ride_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_new_ride_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_new_ride_invalidate(rct_window *w);
static void window_new_ride_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -588,7 +588,7 @@ const sint32 ThrillRidesTabAnimationSequence[] = {
static void window_new_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex)
{
sint32 widgetIndex = WIDX_TAB_1 + page;
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
if (w->widgets[widgetIndex].type != WWT_EMPTY && !(w->disabled_widgets & (1LL << widgetIndex))) {
sint32 frame = 0;
@ -619,7 +619,7 @@ static void window_new_ride_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *
*
* rct2: 0x006B6B38
*/
static void window_new_ride_mouseup(rct_window *w, sint32 widgetIndex)
static void window_new_ride_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -638,7 +638,7 @@ static void window_new_ride_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x006B6B4F
*/
static void window_new_ride_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_new_ride_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_7)
window_new_ride_set_page(w, widgetIndex - WIDX_TAB_1);
@ -726,7 +726,7 @@ static void window_new_ride_scrollmouseover(rct_window *w, sint32 scrollIndex, s
*
* rct2: 0x006B6BBF
*/
static void window_new_ride_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_new_ride_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}

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

@ -41,11 +41,11 @@ static rct_widget window_news_widgets[] = {
{ WIDGETS_END },
};
static void window_news_mouseup(rct_window *w, sint32 widgetIndex);
static void window_news_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_news_update(rct_window *w);
static void window_news_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_news_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_news_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_news_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_news_invalidate(rct_window *w);
static void window_news_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_news_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -121,7 +121,7 @@ void window_news_open()
*
* rct2: 0x0066D4D5
*/
static void window_news_mouseup(rct_window *w, sint32 widgetIndex)
static void window_news_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -247,7 +247,7 @@ static void window_news_scrollmousedown(rct_window *w, sint32 scrollIndex, sint3
*
* rct2: 0x0066EAAE
*/
static void window_news_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_news_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}

6
src/openrct2/windows/news_options.c
View File

@ -85,7 +85,7 @@ static rct_widget window_news_options_widgets[] = {
{ WIDGETS_END },
};
static void window_news_options_mouseup(rct_window *w, sint32 widgetIndex);
static void window_news_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_news_options_update(rct_window *w);
static void window_news_options_invalidate(rct_window *w);
static void window_news_options_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -152,7 +152,7 @@ void window_news_options_open()
}
}
static void window_news_options_mouseup(rct_window *w, sint32 widgetIndex)
static void window_news_options_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -274,7 +274,7 @@ const sint32 window_news_option_tab_animation_frames[] = { 1, 16, 8 };
static void window_news_options_draw_tab_image(rct_window *w, rct_drawpixelinfo *dpi, sint32 page, sint32 spriteIndex)
{
sint32 widgetIndex = WIDX_TAB_PARK + page;
rct_widgetindex widgetIndex = WIDX_TAB_PARK + page;
if (!(w->disabled_widgets & (1LL << widgetIndex))) {
if (w->page == page) {

22
src/openrct2/windows/options.c
View File

@ -402,15 +402,15 @@ static void window_options_update_height_markers();
#pragma region Events
static void window_options_mouseup(rct_window *w, sint32 widgetIndex);
static void window_options_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_options_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_options_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_options_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_options_update(rct_window *w);
static void window_options_invalidate(rct_window *w);
static void window_options_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_options_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_options_text_input(rct_window *w, sint32 widgetIndex, char *text);
static void window_options_tooltip(rct_window *w, sint32 widgetIndex, rct_string_id *stringid);
static void window_options_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_options_tooltip(rct_window *w, rct_widgetindex widgetIndex, rct_string_id *stringid);
static rct_window_event_list window_options_events = {
NULL,
@ -594,7 +594,7 @@ void window_options_open()
*
* rct2: 0x006BAFCA
*/
static void window_options_mouseup(rct_window *w, sint32 widgetIndex)
static void window_options_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -923,7 +923,7 @@ static void window_options_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x006BB01B
*/
static void window_options_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_options_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
uint32 num_items;
@ -1252,7 +1252,7 @@ static void window_options_mousedown(sint32 widgetIndex, rct_window*w, rct_widge
*
* rct2: 0x006BB076
*/
static void window_options_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_options_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -2008,7 +2008,7 @@ static void window_options_scrollgetsize(rct_window *w, sint32 scrollIndex, sint
}
}
static void window_options_text_input(rct_window *w, sint32 widgetIndex, char *text)
static void window_options_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (text == NULL)
return;
@ -2021,7 +2021,7 @@ static void window_options_text_input(rct_window *w, sint32 widgetIndex, char *t
}
}
static void window_options_tooltip(rct_window *w, sint32 widgetIndex, rct_string_id *stringid)
static void window_options_tooltip(rct_window *w, rct_widgetindex widgetIndex, rct_string_id *stringid)
{
if (widgetIndex == WIDX_PATH_TO_RCT1_BUTTON && w->page == WINDOW_OPTIONS_PAGE_MISC) {
if (str_is_null_or_empty(gConfigGeneral.rct1_path)) {
@ -2060,7 +2060,7 @@ static void window_options_set_pressed_tab(rct_window *w)
static void window_options_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex)
{
sint32 widgetIndex = WIDX_TAB_1 + page;
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
rct_widget *widget = &w->widgets[widgetIndex];
sint16 l = w->x + widget->left;

68
src/openrct2/windows/park.c
View File

@ -158,53 +158,53 @@ static rct_widget *window_park_page_widgets[] = {
#pragma region Events
static void window_park_entrance_close(rct_window *w);
static void window_park_entrance_mouseup(rct_window *w, sint32 widgetIndex);
static void window_park_entrance_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_entrance_resize(rct_window *w);
static void window_park_entrance_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_park_entrance_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_park_entrance_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_park_entrance_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_park_entrance_update(rct_window *w);
static void window_park_entrance_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_park_entrance_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_park_entrance_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_park_entrance_toolabort(rct_window *w, sint32 widgetIndex);
static void window_park_entrance_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_park_entrance_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_park_entrance_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_park_entrance_tooldrag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_park_entrance_toolabort(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_entrance_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_park_entrance_invalidate(rct_window *w);
static void window_park_entrance_paint(rct_window *w, rct_drawpixelinfo *dpi);
void toggle_land_rights_window(rct_window *parkWindow, sint32 widgetIndex);
void toggle_land_rights_window(rct_window *parkWindow, rct_widgetindex widgetIndex);
static void window_park_rating_mouseup(rct_window *w, sint32 widgetIndex);
static void window_park_rating_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_rating_resize(rct_window *w);
static void window_park_rating_update(rct_window *w);
static void window_park_rating_invalidate(rct_window *w);
static void window_park_rating_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_guests_mouseup(rct_window *w, sint32 widgetIndex);
static void window_park_guests_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_guests_resize(rct_window *w);
static void window_park_guests_update(rct_window *w);
static void window_park_guests_invalidate(rct_window *w);
static void window_park_guests_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_price_mouseup(rct_window *w, sint32 widgetIndex);
static void window_park_price_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_price_resize(rct_window *w);
static void window_park_price_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_park_price_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_park_price_update(rct_window *w);
static void window_park_price_invalidate(rct_window *w);
static void window_park_price_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_stats_mouseup(rct_window *w, sint32 widgetIndex);
static void window_park_stats_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_stats_resize(rct_window *w);
static void window_park_stats_update(rct_window *w);
static void window_park_stats_invalidate(rct_window *w);
static void window_park_stats_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_objective_mouseup(rct_window *w, sint32 widgetIndex);
static void window_park_objective_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_objective_resize(rct_window *w);
static void window_park_objective_update(rct_window *w);
static void window_park_objective_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_park_objective_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_park_objective_invalidate(rct_window *w);
static void window_park_objective_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_park_awards_mouseup(rct_window *w, sint32 widgetIndex);
static void window_park_awards_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_park_awards_resize(rct_window *w);
static void window_park_awards_update(rct_window *w);
static void window_park_awards_invalidate(rct_window *w);
@ -644,7 +644,7 @@ static void window_park_entrance_close(rct_window *w)
*
* rct2: 0x0066817C
*/
static void window_park_entrance_mouseup(rct_window *w, sint32 widgetIndex)
static void window_park_entrance_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -695,7 +695,7 @@ static void window_park_entrance_resize(rct_window *w)
*
* rct2: 0x006681BF
*/
static void window_park_entrance_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_park_entrance_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
if (widgetIndex == WIDX_OPEN_OR_CLOSE) {
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
@ -725,7 +725,7 @@ static void window_park_entrance_mousedown(sint32 widgetIndex, rct_window*w, rct
*
* rct2: 0x006682B8
*/
static void window_park_entrance_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_park_entrance_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex == WIDX_OPEN_OR_CLOSE) {
if (dropdownIndex == -1)
@ -834,7 +834,7 @@ static void window_park_entrance_tool_update_land_rights(sint16 x, sint16 y)
*
* rct2: 0x006681D1
*/
static void window_park_entrance_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_park_entrance_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex){
case WIDX_BUY_LAND_RIGHTS:
@ -847,7 +847,7 @@ static void window_park_entrance_toolupdate(rct_window* w, sint32 widgetIndex, s
*
* rct2: 0x006681E6
*/
static void window_park_entrance_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_park_entrance_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex){
case WIDX_BUY_LAND_RIGHTS:
@ -887,7 +887,7 @@ static void window_park_entrance_tooldown(rct_window* w, sint32 widgetIndex, sin
*
* rct2: 0x006681FB
*/
static void window_park_entrance_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_park_entrance_tooldrag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
rct_window* w2 = window_find_by_number(0xB, 0);
@ -931,7 +931,7 @@ static void window_park_entrance_tooldrag(rct_window* w, sint32 widgetIndex, sin
*
* rct2: 0x0066822A
*/
static void window_park_entrance_toolabort(rct_window *w, sint32 widgetIndex)
static void window_park_entrance_toolabort(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_BUY_LAND_RIGHTS) {
hide_gridlines();
@ -950,7 +950,7 @@ static void window_park_entrance_toolabort(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x0066848B
*/
static void window_park_entrance_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_park_entrance_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex == WIDX_RENAME && text != NULL)
park_set_name(text);
@ -1154,7 +1154,7 @@ static void window_park_init_viewport(rct_window *w)
window_invalidate(w);
}
void toggle_land_rights_window(rct_window *parkWindow, sint32 widgetIndex)
void toggle_land_rights_window(rct_window *parkWindow, rct_widgetindex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WC_PARK_INFORMATION &&
gCurrentToolWidget.widget_index == WIDX_BUY_LAND_RIGHTS) {
@ -1206,7 +1206,7 @@ void window_park_rating_open()
*
* rct2: 0x00668A06
*/
static void window_park_rating_mouseup(rct_window *w, sint32 widgetIndex)
static void window_park_rating_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
@ -1322,7 +1322,7 @@ void window_park_guests_open()
*
* rct2: 0x00668DEB
*/
static void window_park_guests_mouseup(rct_window *w, sint32 widgetIndex)
static void window_park_guests_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
@ -1410,7 +1410,7 @@ static void window_park_guests_paint(rct_window *w, rct_drawpixelinfo *dpi)
*
* rct2: 0x00669011
*/
static void window_park_price_mouseup(rct_window *w, sint32 widgetIndex)
static void window_park_price_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
@ -1431,7 +1431,7 @@ static void window_park_price_resize(rct_window *w)
*
* rct2: 0x0066902C
*/
static void window_park_price_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_park_price_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
sint32 newFee;
@ -1544,7 +1544,7 @@ static void window_park_price_paint(rct_window *w, rct_drawpixelinfo *dpi)
*
* rct2: 0x0066928C
*/
static void window_park_stats_mouseup(rct_window *w, sint32 widgetIndex)
static void window_park_stats_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);
@ -1695,7 +1695,7 @@ void window_park_objective_open()
*
* rct2: 0x006695AA
*/
static void window_park_objective_mouseup(rct_window *w, sint32 widgetIndex)
static void window_park_objective_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -1747,7 +1747,7 @@ static void window_park_objective_update(rct_window *w)
*
* rct2: 0x006695CC
*/
static void window_park_objective_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_park_objective_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex == WIDX_ENTER_NAME && text != NULL && text[0] != 0) {
scenario_success_submit_name(text);
@ -1857,7 +1857,7 @@ void window_park_awards_open()
*
* rct2: 0x00669851
*/
static void window_park_awards_mouseup(rct_window *w, sint32 widgetIndex)
static void window_park_awards_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
window_close(w);

16
src/openrct2/windows/player.c
View File

@ -92,10 +92,10 @@ rct_widget *window_player_page_widgets[] = {
#pragma region Events
void window_player_overview_close(rct_window *w);
void window_player_overview_mouse_up(rct_window *w, sint32 widgetIndex);
void window_player_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
void window_player_overview_resize(rct_window *w);
void window_player_overview_mouse_down(sint32 widgetIndex, rct_window *w, rct_widget *widget);
void window_player_overview_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
void window_player_overview_mouse_down(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
void window_player_overview_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
void window_player_overview_update(rct_window* w);
void window_player_overview_invalidate(rct_window *w);
void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -132,7 +132,7 @@ static rct_window_event_list window_player_overview_events = {
};
void window_player_statistics_close(rct_window *w);
void window_player_statistics_mouse_up(rct_window *w, sint32 widgetIndex);
void window_player_statistics_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
void window_player_statistics_resize(rct_window *w);
void window_player_statistics_update(rct_window* w);
void window_player_statistics_invalidate(rct_window *w);
@ -269,7 +269,7 @@ void window_player_overview_close(rct_window *w)
}
void window_player_overview_mouse_up(rct_window *w, sint32 widgetIndex)
void window_player_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex)
{
switch(widgetIndex){
case WIDX_CLOSE:
@ -298,7 +298,7 @@ void window_player_overview_mouse_up(rct_window *w, sint32 widgetIndex)
}
}
void window_player_overview_mouse_down(sint32 widgetIndex, rct_window *w, rct_widget *widget)
void window_player_overview_mouse_down(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
switch(widgetIndex){
case WIDX_GROUP_DROPDOWN:
@ -307,7 +307,7 @@ void window_player_overview_mouse_down(sint32 widgetIndex, rct_window *w, rct_wi
}
}
void window_player_overview_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
void window_player_overview_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
sint32 player = network_get_player_index((uint8)w->number);
if (player == -1) {
@ -463,7 +463,7 @@ void window_player_statistics_close(rct_window *w)
}
}
void window_player_statistics_mouse_up(rct_window *w, sint32 widgetIndex)
void window_player_statistics_mouse_up(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:

4
src/openrct2/windows/publisher_credits.c
View File

@ -33,7 +33,7 @@ rct_widget window_publisher_credits_widgets[] = {
{ WIDGETS_END },
};
static void window_publisher_credits_mouseup(rct_window *w, sint32 widgetIndex);
static void window_publisher_credits_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_publisher_credits_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_publisher_credits_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_publisher_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -104,7 +104,7 @@ void window_publisher_credits_open()
*
* rct2: 0x0066D7A8
*/
static void window_publisher_credits_mouseup(rct_window *w, sint32 widgetIndex)
static void window_publisher_credits_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:

22
src/openrct2/windows/research.c
View File

@ -104,14 +104,14 @@ static rct_widget *window_research_page_widgets[] = {
#pragma region Events
static void window_research_development_mouseup(rct_window *w, sint32 widgetIndex);
static void window_research_development_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_research_development_update(rct_window *w);
static void window_research_development_invalidate(rct_window *w);
static void window_research_development_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_research_funding_mouseup(rct_window *w, sint32 widgetIndex);
static void window_research_funding_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_research_funding_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_research_funding_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_research_funding_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_research_funding_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_research_funding_update(rct_window *w);
static void window_research_funding_invalidate(rct_window *w);
static void window_research_funding_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -271,7 +271,7 @@ void window_research_open()
*
* rct2: 0x006B6B38
*/
static void window_research_development_mouseup(rct_window *w, sint32 widgetIndex)
static void window_research_development_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -334,7 +334,7 @@ static void window_research_development_paint(rct_window *w, rct_drawpixelinfo *
window_research_development_page_paint(w, dpi, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP);
}
void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 baseWidgetIndex)
void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dpi, rct_widgetindex baseWidgetIndex)
{
baseWidgetIndex = baseWidgetIndex - WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP;
@ -430,7 +430,7 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp
*
* rct2: 0x0069DB3F
*/
static void window_research_funding_mouseup(rct_window *w, sint32 widgetIndex)
static void window_research_funding_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
sint32 activeResearchTypes;
@ -460,7 +460,7 @@ static void window_research_funding_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x0069DB66
*/
static void window_research_funding_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_research_funding_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
rct_widget *dropdownWidget;
sint32 i;
@ -493,7 +493,7 @@ static void window_research_funding_mousedown(sint32 widgetIndex, rct_window *w,
*
* rct2: 0x0069DB6D
*/
static void window_research_funding_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_research_funding_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON || dropdownIndex == -1)
return;
@ -578,7 +578,7 @@ static void window_research_funding_paint(rct_window *w, rct_drawpixelinfo *dpi)
window_research_funding_page_paint(w, dpi, WIDX_RESEARCH_FUNDING);
}
void window_research_funding_page_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 baseWidgetIndex)
void window_research_funding_page_paint(rct_window *w, rct_drawpixelinfo *dpi, rct_widgetindex baseWidgetIndex)
{
if (gParkFlags & PARK_FLAGS_NO_MONEY)
return;
@ -637,7 +637,7 @@ static void window_research_set_pressed_tab(rct_window *w)
static void window_research_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex)
{
sint32 widgetIndex = WIDX_TAB_1 + page;
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
if (!(w->disabled_widgets & (1LL << widgetIndex))) {
if (w->page == page) {

144
src/openrct2/windows/ride.c
View File

@ -522,91 +522,91 @@ const uint64 window_ride_page_hold_down_widgets[] = {
static void window_ride_init_viewport(rct_window *w);
static void window_ride_main_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_main_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_main_resize(rct_window *w);
static void window_ride_main_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_main_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_ride_main_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_main_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_ride_main_update(rct_window *w);
static void window_ride_main_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_ride_main_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_ride_main_unknown_14(rct_window *w);
static void window_ride_main_invalidate(rct_window *w);
static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_vehicle_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_vehicle_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_vehicle_resize(rct_window *w);
static void window_ride_vehicle_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_vehicle_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_ride_vehicle_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_vehicle_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_ride_vehicle_update(rct_window *w);
static void window_ride_vehicle_invalidate(rct_window *w);
static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
static void window_ride_operating_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_operating_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_operating_resize(rct_window *w);
static void window_ride_operating_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_operating_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_ride_operating_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_operating_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_ride_operating_update(rct_window *w);
static void window_ride_operating_invalidate(rct_window *w);
static void window_ride_operating_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_maintenance_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_maintenance_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_maintenance_resize(rct_window *w);
static void window_ride_maintenance_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_maintenance_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_ride_maintenance_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_maintenance_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_ride_maintenance_update(rct_window *w);
static void window_ride_maintenance_invalidate(rct_window *w);
static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_colour_close(rct_window *w);
static void window_ride_colour_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_colour_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_colour_resize(rct_window *w);
static void window_ride_colour_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_colour_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_ride_colour_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_colour_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_ride_colour_update(rct_window *w);
static void window_ride_colour_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_ride_colour_tooldrag(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_ride_colour_tooldown(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_ride_colour_tooldrag(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_ride_colour_invalidate(rct_window *w);
static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
static void window_ride_music_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_music_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_music_resize(rct_window *w);
static void window_ride_music_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_music_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_ride_music_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_music_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_ride_music_update(rct_window *w);
static void window_ride_music_invalidate(rct_window *w);
static void window_ride_music_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_measurements_close(rct_window *w);
static void window_ride_measurements_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_measurements_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_measurements_resize(rct_window *w);
static void window_ride_measurements_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_measurements_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_ride_measurements_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_measurements_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_ride_measurements_update(rct_window *w);
static void window_ride_measurements_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_ride_measurements_toolabort(rct_window *w, sint32 widgetIndex);
static void window_ride_measurements_tooldown(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_ride_measurements_toolabort(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_measurements_invalidate(rct_window *w);
static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_graphs_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_graphs_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_graphs_resize(rct_window *w);
static void window_ride_graphs_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_graphs_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_graphs_update(rct_window *w);
static void window_ride_graphs_scrollgetheight(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_ride_graphs_15(rct_window *w, sint32 scrollIndex, sint32 scrollAreaType);
static void window_ride_graphs_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_ride_graphs_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_ride_graphs_invalidate(rct_window *w);
static void window_ride_graphs_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
static void window_ride_income_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_income_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_income_resize(rct_window *w);
static void window_ride_income_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_income_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_income_update(rct_window *w);
static void window_ride_income_invalidate(rct_window *w);
static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_customer_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_customer_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_customer_resize(rct_window *w);
static void window_ride_customer_update(rct_window *w);
static void window_ride_customer_invalidate(rct_window *w);
@ -1256,7 +1256,7 @@ static const rct_window_graphs_y_axis window_graphs_y_axi[] = {
static void window_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex)
{
sint32 widgetIndex = WIDX_TAB_1 + page;
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
if (!(w->disabled_widgets & (1LL << widgetIndex))) {
if (w->page == page) {
@ -1274,7 +1274,7 @@ static void window_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, si
*/
static void window_ride_draw_tab_main(rct_drawpixelinfo *dpi, rct_window *w)
{
sint32 widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_MAIN;
rct_widgetindex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_MAIN;
if (!(w->disabled_widgets & (1LL << widgetIndex))) {
sint32 spriteIndex = 0;
@ -1308,7 +1308,7 @@ static void window_ride_draw_tab_main(rct_drawpixelinfo *dpi, rct_window *w)
*/
static void window_ride_draw_tab_vehicle(rct_drawpixelinfo *dpi, rct_window *w)
{
sint32 widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_VEHICLE;
rct_widgetindex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_VEHICLE;
rct_widget *widget = &w->widgets[widgetIndex];
if (!(w->disabled_widgets & (1LL << widgetIndex))) {
@ -1367,7 +1367,7 @@ static void window_ride_draw_tab_vehicle(rct_drawpixelinfo *dpi, rct_window *w)
*/
static void window_ride_draw_tab_customer(rct_drawpixelinfo *dpi, rct_window *w)
{
sint32 widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_CUSTOMER;
rct_widgetindex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_CUSTOMER;
if (!(w->disabled_widgets & (1LL << widgetIndex))) {
rct_widget *widget = &w->widgets[widgetIndex];
@ -1949,7 +1949,7 @@ static void window_ride_rename(rct_window *w)
*
* rct2: 0x006AF17E
*/
static void window_ride_main_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_main_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
uint8 rideIndex;
rct_ride *ride;
@ -1993,17 +1993,17 @@ static void window_ride_main_mouseup(rct_window *w, sint32 widgetIndex)
ride = get_ride(w->number);
switch (widgetIndex - WIDX_CLOSE_LIGHT) {
switch (widgetIndex) {
default:
case 0:
case WIDX_CLOSE_LIGHT:
status = RIDE_STATUS_CLOSED;
gGameCommandErrorTitle = STR_CANT_CLOSE;
break;
case 1:
case WIDX_TEST_LIGHT:
status = RIDE_STATUS_TESTING;
gGameCommandErrorTitle = STR_CANT_TEST;
break;
case 2:
case WIDX_OPEN_LIGHT:
status = RIDE_STATUS_OPEN;
gGameCommandErrorTitle = STR_CANT_OPEN;
break;
@ -2171,7 +2171,7 @@ static void window_ride_show_open_dropdown(rct_window *w, rct_widget *widget)
*
* rct2: 0x006AF1BD
*/
static void window_ride_main_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_main_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
switch (widgetIndex) {
case WIDX_VIEW_DROPDOWN:
@ -2209,7 +2209,7 @@ static void window_ride_main_mousedown(sint32 widgetIndex, rct_window *w, rct_wi
*
* rct2: 0x006AF300
*/
static void window_ride_main_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_ride_main_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
rct_ride *ride;
sint32 status = 0;
@ -2304,7 +2304,7 @@ static void window_ride_main_update(rct_window *w)
*
* rct2: 0x006AF2F9
*/
static void window_ride_main_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_ride_main_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex != WIDX_RENAME || text == NULL)
return;
@ -2638,7 +2638,7 @@ static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi)
*
* rct2: 0x006B272D
*/
static void window_ride_vehicle_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_vehicle_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -2672,7 +2672,7 @@ static void window_ride_vehicle_resize(rct_window *w)
*
* rct2: 0x006B2748
*/
static void window_ride_vehicle_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_vehicle_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
rct_widget *dropdownWidget = widget - 1;
rct_ride *ride;
@ -2767,7 +2767,7 @@ static void window_ride_vehicle_mousedown(sint32 widgetIndex, rct_window *w, rct
*
* rct2: 0x006B2767
*/
static void window_ride_vehicle_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_ride_vehicle_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -3210,7 +3210,7 @@ static void window_ride_load_dropdown(rct_window *w, rct_widget *widget)
*
* rct2: 0x006B10A7
*/
static void window_ride_operating_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_operating_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_ride *ride;
@ -3263,7 +3263,7 @@ static void window_ride_operating_resize(rct_window *w)
*
* rct2: 0x006B10F4
*/
static void window_ride_operating_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_operating_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
rct_ride *ride = get_ride(w->number);
uint8 upper_bound, lower_bound;
@ -3328,7 +3328,7 @@ static void window_ride_operating_mousedown(sint32 widgetIndex, rct_window *w, r
*
* rct2: 0x006B1165
*/
static void window_ride_operating_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_ride_operating_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
rct_ride *ride;
const uint8 *availableModes;
@ -3671,7 +3671,7 @@ static void window_ride_maintenance_draw_bar(rct_window *w, rct_drawpixelinfo *d
*
* rct2: 0x006B1AAD
*/
static void window_ride_maintenance_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_maintenance_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -3708,7 +3708,7 @@ static void window_ride_maintenance_resize(rct_window *w)
*
* rct2: 0x006B1ACE
*/
static void window_ride_maintenance_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_maintenance_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
rct_ride *ride = get_ride(w->number);
rct_ride_entry *ride_type = get_ride_entry(ride->subtype);
@ -3806,7 +3806,7 @@ static void window_ride_maintenance_mousedown(sint32 widgetIndex, rct_window *w,
*
* rct2: 0x006B1AD9
*/
static void window_ride_maintenance_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_ride_maintenance_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -4134,7 +4134,7 @@ static void window_ride_colour_close(rct_window *w)
*
* rct2: 0x006B02A1
*/
static void window_ride_colour_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_colour_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -4171,7 +4171,7 @@ static void window_ride_colour_resize(rct_window *w)
*
* rct2: 0x006B02C6
*/
static void window_ride_colour_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_colour_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
rct_ride *ride;
uint16 colourSchemeIndex;
@ -4321,7 +4321,7 @@ static void window_ride_colour_mousedown(sint32 widgetIndex, rct_window *w, rct_
*
* rct2: 0x006B0331
*/
static void window_ride_colour_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_ride_colour_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -4382,7 +4382,7 @@ static void window_ride_colour_update(rct_window *w)
*
* rct2: 0x006B04EC
*/
static void window_ride_colour_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_ride_colour_tooldown(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
window_ride_set_track_colour_scheme(w, x, y);
@ -4392,7 +4392,7 @@ static void window_ride_colour_tooldown(rct_window *w, sint32 widgetIndex, sint3
*
* rct2: 0x006B04F3
*/
static void window_ride_colour_tooldrag(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_ride_colour_tooldrag(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
window_ride_set_track_colour_scheme(w, x, y);
@ -4769,7 +4769,7 @@ static void window_ride_toggle_music(rct_window *w)
*
* rct2: 0x006B1ED7
*/
static void window_ride_music_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_music_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -4807,7 +4807,7 @@ static void window_ride_music_resize(rct_window *w)
*
* rct2: 0x006B1EFC
*/
static void window_ride_music_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_music_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
rct_widget *dropdownWidget;
sint32 i;
@ -4858,7 +4858,7 @@ static void window_ride_music_mousedown(sint32 widgetIndex, rct_window *w, rct_w
*
* rct2: 0x006B1F03
*/
static void window_ride_music_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_ride_music_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
uint8 musicStyle;
@ -5036,7 +5036,7 @@ static void window_ride_measurements_close(rct_window *w)
*
* rct2: 0x006AD478
*/
static void window_ride_measurements_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_measurements_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -5082,7 +5082,7 @@ static void window_ride_measurements_resize(rct_window *w)
*
* rct2: 0x006AD4AB
*/
static void window_ride_measurements_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_measurements_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
if (widgetIndex != WIDX_SAVE_TRACK_DESIGN)
return;
@ -5107,7 +5107,7 @@ static void window_ride_measurements_mousedown(sint32 widgetIndex, rct_window *w
*
* rct2: 0x006AD4B2
*/
static void window_ride_measurements_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_ride_measurements_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex != WIDX_SAVE_TRACK_DESIGN)
return;
@ -5136,7 +5136,7 @@ static void window_ride_measurements_update(rct_window *w)
*
* rct2: 0x006D2AE7
*/
static void window_ride_measurements_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_ride_measurements_tooldown(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
rct_map_element *mapElement;
sint16 mapX, mapY;
@ -5157,7 +5157,7 @@ static void window_ride_measurements_tooldown(rct_window *w, sint32 widgetIndex,
*
* rct2: 0x006AD4DA
*/
static void window_ride_measurements_toolabort(rct_window *w, sint32 widgetIndex)
static void window_ride_measurements_toolabort(rct_window *w, rct_widgetindex widgetIndex)
{
window_ride_measurements_design_cancel();
}
@ -5427,7 +5427,7 @@ static void window_ride_set_graph(rct_window *w, sint32 type)
*
* rct2: 0x006AE85D
*/
static void window_ride_graphs_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_graphs_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -5461,7 +5461,7 @@ static void window_ride_graphs_resize(rct_window *w)
*
* rct2: 0x006AE878
*/
static void window_ride_graphs_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_graphs_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
switch (widgetIndex) {
case WIDX_GRAPH_VELOCITY:
@ -5540,7 +5540,7 @@ static void window_ride_graphs_15(rct_window *w, sint32 scrollIndex, sint32 scro
*
* rct2: 0x006AEA05
*/
static void window_ride_graphs_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_ride_graphs_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
if (widgetIndex == WIDX_GRAPH) {
set_format_arg(0, rct_string_id, STR_GRAPH);
@ -5913,7 +5913,7 @@ static void window_ride_income_decrease_secondary_price(rct_window *w)
*
* rct2: 0x006ADEA9
*/
static void window_ride_income_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_income_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -5953,7 +5953,7 @@ static void window_ride_income_resize(rct_window *w)
*
* rct2: 0x006ADED4
*/
static void window_ride_income_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_income_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
switch (widgetIndex) {
case WIDX_PRIMARY_PRICE_INCREASE:
@ -6178,7 +6178,7 @@ static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi)
*
* rct2: 0x006AD986
*/
static void window_ride_customer_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_customer_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:

24
src/openrct2/windows/ride_construction.c
View File

@ -140,13 +140,13 @@ static rct_widget window_ride_construction_widgets[] = {
#pragma region Events
static void window_ride_construction_close(rct_window *w);
static void window_ride_construction_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_construction_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_construction_resize(rct_window *w);
static void window_ride_construction_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_construction_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_construction_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_ride_construction_update(rct_window *w);
static void window_ride_construction_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_ride_construction_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_ride_construction_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_ride_construction_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_ride_construction_invalidate(rct_window *w);
static void window_ride_construction_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -689,7 +689,7 @@ static void window_ride_construction_close(rct_window *w)
*
* rct2: 0x006C6E14
*/
static void window_ride_construction_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_construction_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
window_ride_construction_update_enabled_track_pieces();
switch (widgetIndex){
@ -1291,7 +1291,7 @@ static void window_ride_construction_resize(rct_window *w)
if (currentDisabledWidgets == disabledWidgets)
return;
for (sint32 i = 0; i < 64; i++) {
for (rct_widgetindex i = 0; i < 64; i++) {
if ((disabledWidgets & (1ULL << i)) != (currentDisabledWidgets & (1ULL << i))) {
widget_invalidate(w, i);
}
@ -1303,7 +1303,7 @@ static void window_ride_construction_resize(rct_window *w)
*
* rct2: 0x006C6E6A
*/
static void window_ride_construction_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget)
static void window_ride_construction_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget)
{
rct_ride *ride = get_ride(_currentRideIndex);
@ -1627,7 +1627,7 @@ static void window_ride_construction_mousedown(sint32 widgetIndex, rct_window *w
*
* rct2: 0x006C78CD
*/
static void window_ride_construction_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_ride_construction_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex != WIDX_SPECIAL_TRACK_DROPDOWN)
return;
@ -2132,7 +2132,7 @@ static bool ride_get_place_position_from_screen_position(sint32 screenX, sint32
*
* rct2: 0x006C8229
*/
static void window_ride_construction_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_ride_construction_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex) {
case WIDX_CONSTRUCT:
@ -2149,7 +2149,7 @@ static void window_ride_construction_toolupdate(rct_window* w, sint32 widgetInde
*
* rct2: 0x006C8248
*/
static void window_ride_construction_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_ride_construction_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex) {
case WIDX_CONSTRUCT:
@ -3414,7 +3414,7 @@ static void window_ride_construction_update_widgets(rct_window *w)
return;
}
sint32 widgetIndex;
rct_widgetindex widgetIndex;
switch (_currentTrackCurve) {
case TRACK_CURVE_NONE:
widgetIndex = WIDX_STRAIGHT;

16
src/openrct2/windows/ride_list.c
View File

@ -74,15 +74,15 @@ static rct_widget window_ride_list_widgets[] = {
static bool _quickDemolishMode = false;
static void window_ride_list_mouseup(rct_window *w, sint32 widgetIndex);
static void window_ride_list_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_ride_list_resize(rct_window *w);
static void window_ride_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_ride_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_ride_list_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_ride_list_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_ride_list_update(rct_window *w);
static void window_ride_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_ride_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_ride_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_ride_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_ride_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_ride_list_invalidate(rct_window *w);
static void window_ride_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -238,7 +238,7 @@ void window_ride_list_open()
*
* rct2: 0x006B3511
*/
static void window_ride_list_mouseup(rct_window *w, sint32 widgetIndex)
static void window_ride_list_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -305,7 +305,7 @@ static void window_ride_list_resize(rct_window *w)
*
* rct2: 0x006B3532
*/
static void window_ride_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_ride_list_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
if (widgetIndex == WIDX_OPEN_CLOSE_ALL) {
gDropdownItemsFormat[0] = STR_CLOSE_ALL;
@ -358,7 +358,7 @@ static void window_ride_list_mousedown(sint32 widgetIndex, rct_window*w, rct_wid
*
* rct2: 0x006B3547
*/
static void window_ride_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_ride_list_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex == WIDX_OPEN_CLOSE_ALL) {
if (dropdownIndex == 0)
@ -460,7 +460,7 @@ static void window_ride_list_scrollmouseover(rct_window *w, sint32 scrollIndex,
*
* rct2: 0x006B3861
*/
static void window_ride_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_ride_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}

4
src/openrct2/windows/save_prompt.c
View File

@ -71,7 +71,7 @@ static const rct_string_id window_save_prompt_labels[][2] = {
static void window_save_prompt_close(rct_window *w);
static void window_save_prompt_mouseup(rct_window *w, sint32 widgetIndex);
static void window_save_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_save_prompt_invalidate(rct_window *w);
static void window_save_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_save_prompt_callback(sint32 result, const utf8 * path);
@ -214,7 +214,7 @@ static void window_save_prompt_close(rct_window *w)
*
* rct2: 0x0066DDF2
*/
static void window_save_prompt_mouseup(rct_window *w, sint32 widgetIndex)
static void window_save_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (gScreenFlags & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) {
switch (widgetIndex) {

20
src/openrct2/windows/scenery.c
View File

@ -62,16 +62,16 @@ enum {
};
static void window_scenery_close(rct_window *w);
static void window_scenery_mouseup(rct_window *w, sint32 widgetIndex);
static void window_scenery_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_scenery_resize(rct_window *w);
static void window_scenery_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget);
static void window_scenery_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_scenery_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget);
static void window_scenery_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_scenery_update(rct_window *w);
static void window_scenery_event_07(rct_window *w);
static void window_scenery_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_scenery_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_scenery_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_scenery_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_scenery_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_scenery_invalidate(rct_window *w);
static void window_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_scenery_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -311,7 +311,7 @@ void init_scenery()
init_scenery_entry(sceneryEntry, sceneryId, sceneryEntry->path_bit.scenery_tab_id);
}
for (sint32 widgetIndex = WIDX_SCENERY_TAB_1; widgetIndex < WIDX_SCENERY_LIST; widgetIndex++)
for (rct_widgetindex widgetIndex = WIDX_SCENERY_TAB_1; widgetIndex < WIDX_SCENERY_LIST; widgetIndex++)
window_scenery_widgets[widgetIndex].type = WWT_EMPTY;
uint8 tabIndexes[20];
@ -557,7 +557,7 @@ static sint32 rows_on_page(sint32 height)
*
* rct2: 0x006BD94C
*/
static void window_scenery_mouseup(rct_window *w, sint32 widgetIndex)
static void window_scenery_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_SCENERY_CLOSE:
@ -667,7 +667,7 @@ static void window_scenery_resize(rct_window *w)
*
* rct2: 0x006E1A25
*/
static void window_scenery_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget) {
static void window_scenery_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget) {
switch (widgetIndex) {
case WIDX_SCENERY_PRIMARY_COLOUR_BUTTON:
window_dropdown_show_colour(w, widget, w->colours[1], gWindowSceneryPrimaryColour);
@ -694,7 +694,7 @@ static void window_scenery_mousedown(sint32 widgetIndex, rct_window* w, rct_widg
*
* rct2: 0x006E1A54
*/
static void window_scenery_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_scenery_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -735,7 +735,7 @@ static void window_scenery_update(rct_window *w)
sint32 window_y = gCursorState.y - w->y;
if (window_y < 44 || window_x <= w->width) {
sint32 widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y);
rct_widgetindex widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y);
if (widgetIndex >= WIDX_SCENERY_TAB_CONTENT_PANEL) {
w->scenery.hover_counter++;
if (w->scenery.hover_counter < 8) {
@ -865,7 +865,7 @@ void window_scenery_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x,
*
* rct2: 0x006E1C05
*/
void window_scenery_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
void window_scenery_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
switch (widgetIndex) {
case WIDX_SCENERY_LIST:

12
src/openrct2/windows/server_list.c
View File

@ -70,14 +70,14 @@ static rct_widget window_server_list_widgets[] = {
};
static void window_server_list_close(rct_window *w);
static void window_server_list_mouseup(rct_window *w, sint32 widgetIndex);
static void window_server_list_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_server_list_resize(rct_window *w);
static void window_server_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_server_list_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_server_list_update(rct_window *w);
static void window_server_list_scroll_getsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_server_list_scroll_mousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_server_list_scroll_mouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_server_list_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_server_list_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_server_list_invalidate(rct_window *w);
static void window_server_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_server_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -193,7 +193,7 @@ static void window_server_list_close(rct_window *w)
}
}
static void window_server_list_mouseup(rct_window *w, sint32 widgetIndex)
static void window_server_list_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -231,7 +231,7 @@ static void window_server_list_resize(rct_window *w)
window_set_resize(w, WWIDTH_MIN, WHEIGHT_MIN, WWIDTH_MAX, WHEIGHT_MAX);
}
static void window_server_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_server_list_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
sint32 serverIndex = w->selected_list_item;
if (serverIndex < 0) return;
@ -329,7 +329,7 @@ static void window_server_list_scroll_mouseover(rct_window *w, sint32 scrollInde
}
}
static void window_server_list_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_server_list_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (text == NULL || text[0] == 0) return;

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

@ -71,9 +71,9 @@ static rct_widget window_server_start_widgets[] = {
};
static void window_server_start_close(rct_window *w);
static void window_server_start_mouseup(rct_window *w, sint32 widgetIndex);
static void window_server_start_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_server_start_update(rct_window *w);
static void window_server_start_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_server_start_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_server_start_invalidate(rct_window *w);
static void window_server_start_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -179,7 +179,7 @@ static void window_server_start_loadsave_callback(sint32 result, const utf8 * pa
}
}
static void window_server_start_mouseup(rct_window *w, sint32 widgetIndex)
static void window_server_start_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -241,7 +241,7 @@ static void window_server_start_update(rct_window *w)
}
}
static void window_server_start_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_server_start_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (text == NULL) return;

4
src/openrct2/windows/shortcut_key_change.c
View File

@ -40,7 +40,7 @@ static rct_widget window_shortcut_change_widgets[] = {
{ WIDGETS_END }
};
static void window_shortcut_change_mouseup(rct_window *w, sint32 widgetIndex);
static void window_shortcut_change_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_shortcut_change_invalidate(rct_window *w);
static void window_shortcut_change_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -92,7 +92,7 @@ void window_shortcut_change_open(sint32 selected_key){
*
* rct2: 0x006E3AE0
*/
static void window_shortcut_change_mouseup(rct_window *w, sint32 widgetIndex)
static void window_shortcut_change_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex){
case WIDX_CLOSE:

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

@ -46,11 +46,11 @@ static rct_widget window_shortcut_widgets[] = {
{ WIDGETS_END }
};
static void window_shortcut_mouseup(rct_window *w, sint32 widgetIndex);
static void window_shortcut_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_shortcut_resize(rct_window *w);
static void window_shortcut_invalidate(rct_window *w);
static void window_shortcut_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_shortcut_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_shortcut_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_shortcut_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_shortcut_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_shortcut_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
@ -182,7 +182,7 @@ void window_shortcut_keys_open()
*
* rct2: 0x006E39E4
*/
static void window_shortcut_mouseup(rct_window *w, sint32 widgetIndex)
static void window_shortcut_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex){
case WIDX_CLOSE:
@ -229,7 +229,7 @@ static void window_shortcut_paint(rct_window *w, rct_drawpixelinfo *dpi)
*
* rct2: 0x006E3A0C
*/
static void window_shortcut_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_shortcut_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}

24
src/openrct2/windows/sign.c
View File

@ -57,10 +57,10 @@ rct_widget window_sign_widgets[] = {
{ WIDGETS_END },
};
static void window_sign_mouseup(rct_window *w, sint32 widgetIndex);
static void window_sign_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_sign_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_sign_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_sign_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_sign_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_sign_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_sign_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_sign_unknown_14(rct_window *w);
static void window_sign_invalidate(rct_window *w);
static void window_sign_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -98,8 +98,8 @@ static rct_window_event_list window_sign_events = {
NULL
};
static void window_sign_small_mouseup(rct_window *w, sint32 widgetIndex);
static void window_sign_small_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_sign_small_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_sign_small_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_sign_small_invalidate(rct_window *w);
// 0x9A410C
@ -214,7 +214,7 @@ void window_sign_open(rct_windownumber number)
*
* rct2: 0x6B9765
*/
static void window_sign_mouseup(rct_window *w, sint32 widgetIndex)
static void window_sign_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_banner* banner = &gBanners[w->number];
sint32 x = banner->x << 5;
@ -270,7 +270,7 @@ static void window_sign_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x6B9784
& 0x6E6164 */
static void window_sign_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_sign_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
switch (widgetIndex) {
case WIDX_MAIN_COLOUR:
@ -286,7 +286,7 @@ static void window_sign_mousedown(sint32 widgetIndex, rct_window*w, rct_widget*
*
* rct2: 0x6B979C
*/
static void window_sign_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_sign_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
switch (widgetIndex){
case WIDX_MAIN_COLOUR:
@ -310,7 +310,7 @@ static void window_sign_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropd
*
* rct2: 0x6B9791, 0x6E6171
*/
static void window_sign_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_sign_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex == WIDX_SIGN_TEXT && text != NULL) {
game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 0)), GAME_COMMAND_SET_SIGN_NAME, *((sint32*)(text + 8)), *((sint32*)(text + 4)));
@ -479,7 +479,7 @@ void window_sign_small_open(rct_windownumber number){
*
* rct2: 0x6E6145
*/
static void window_sign_small_mouseup(rct_window *w, sint32 widgetIndex)
static void window_sign_small_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_banner* banner = &gBanners[w->number];
sint32 x = banner->x << 5;
@ -533,7 +533,7 @@ static void window_sign_small_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x6E617C
*/
static void window_sign_small_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_sign_small_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
switch (widgetIndex){
case WIDX_MAIN_COLOUR:

44
src/openrct2/windows/staff.c
View File

@ -130,29 +130,29 @@ void window_staff_unknown_05(rct_window *w);
void window_staff_viewport_init(rct_window* w);
void window_staff_overview_close(rct_window *w);
void window_staff_overview_mouseup(rct_window *w, sint32 widgetIndex);
void window_staff_overview_mouseup(rct_window *w, rct_widgetindex widgetIndex);
void window_staff_overview_resize(rct_window *w);
void window_staff_overview_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget);
void window_staff_overview_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
void window_staff_overview_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget);
void window_staff_overview_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
void window_staff_overview_update(rct_window* w);
void window_staff_overview_invalidate(rct_window *w);
void window_staff_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
void window_staff_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
void window_staff_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
void window_staff_overview_tool_abort(rct_window *w, sint32 widgetIndex);
void window_staff_overview_text_input(rct_window *w, sint32 widgetIndex, char *text);
void window_staff_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_staff_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex);
void window_staff_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
void window_staff_overview_unknown_14(rct_window *w);
void window_staff_options_mouseup(rct_window *w, sint32 widgetIndex);
void window_staff_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
void window_staff_options_update(rct_window* w);
void window_staff_options_invalidate(rct_window *w);
void window_staff_options_paint(rct_window *w, rct_drawpixelinfo *dpi);
void window_staff_options_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
void window_staff_options_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget);
void window_staff_options_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
void window_staff_options_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget);
void window_staff_options_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
void window_staff_stats_mouseup(rct_window *w, sint32 widgetIndex);
void window_staff_stats_mouseup(rct_window *w, rct_widgetindex widgetIndex);
void window_staff_stats_resize(rct_window *w);
void window_staff_stats_update(rct_window* w);
void window_staff_stats_invalidate(rct_window *w);
@ -458,7 +458,7 @@ void game_command_callback_pickup_staff(sint32 eax, sint32 ebx, sint32 ecx, sint
*
* rct2: 0x006BDF55
*/
void window_staff_overview_mouseup(rct_window *w, sint32 widgetIndex)
void window_staff_overview_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_peep* peep = GET_PEEP(w->number);
@ -549,7 +549,7 @@ void window_staff_overview_resize(rct_window *w)
* Handle the dropdown of patrol button.
* rct2: 0x006BDF98
*/
void window_staff_overview_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget)
void window_staff_overview_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget)
{
if (widgetIndex != WIDX_PATROL) {
return;
@ -577,7 +577,7 @@ void window_staff_overview_mousedown(sint32 widgetIndex, rct_window* w, rct_widg
*
* rct2: 0x006BDFA3
*/
void window_staff_overview_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
void window_staff_overview_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex != WIDX_PATROL) {
return;
@ -637,7 +637,7 @@ static void window_staff_set_order(rct_window* w, sint32 order_id)
*
* rct2: 0x006BE7DB
*/
void window_staff_options_mouseup(rct_window *w, sint32 widgetIndex)
void window_staff_options_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -671,7 +671,7 @@ void window_staff_options_update(rct_window* w)
*
* rct2: 0x006BEBCF
*/
void window_staff_stats_mouseup(rct_window *w, sint32 widgetIndex)
void window_staff_stats_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -1106,7 +1106,7 @@ void window_staff_stats_paint(rct_window *w, rct_drawpixelinfo *dpi)
*
* rct2: 0x006BDFD8
*/
void window_staff_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
void window_staff_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -1157,7 +1157,7 @@ void window_staff_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32
*
* rct2: 0x006BDFC3
*/
void window_staff_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex == WIDX_PICKUP) {
sint32 dest_x, dest_y;
@ -1184,7 +1184,7 @@ void window_staff_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x
*
* rct2: 0x6BDFAE
*/
void window_staff_overview_tool_abort(rct_window *w, sint32 widgetIndex)
void window_staff_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_PICKUP) {
game_do_command(w->number, GAME_COMMAND_FLAG_APPLY, 1, 0, GAME_COMMAND_PICKUP_STAFF, w->picked_peep_old_x, 0);
@ -1197,7 +1197,7 @@ void window_staff_overview_tool_abort(rct_window *w, sint32 widgetIndex)
}
/* rct2: 0x6BDFED */
void window_staff_overview_text_input(rct_window *w, sint32 widgetIndex, char *text)
void window_staff_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex != WIDX_RENAME)
return;
@ -1292,7 +1292,7 @@ void window_staff_viewport_init(rct_window* w){
* Handle the costume of staff member.
* rct2: 0x006BE802
*/
void window_staff_options_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget)
void window_staff_options_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget)
{
if (widgetIndex != WIDX_COSTUME_BTN) {
return;
@ -1330,7 +1330,7 @@ void window_staff_options_mousedown(sint32 widgetIndex, rct_window* w, rct_widge
*
* rct2: 0x6BE809
*/
void window_staff_options_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
void window_staff_options_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex != WIDX_COSTUME_BTN) {
return;

4
src/openrct2/windows/staff_fire_prompt.c
View File

@ -45,7 +45,7 @@ static rct_widget window_staff_fire_widgets[] = {
{ WIDGETS_END }
};
static void window_staff_fire_mouseup(rct_window *w, sint32 widgetIndex);
static void window_staff_fire_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_staff_fire_invalidate(rct_window *w);
static void window_staff_fire_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -104,7 +104,7 @@ void window_staff_fire_prompt_open(rct_peep* peep)
*
* rct2: 0x006C0B40
*/
static void window_staff_fire_mouseup(rct_window *w, sint32 widgetIndex)
static void window_staff_fire_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_peep* peep = &get_sprite(w->number)->peep;

24
src/openrct2/windows/staff_list.c
View File

@ -43,17 +43,17 @@ enum {
bool _quick_fire_mode = false;
static void window_staff_list_close(rct_window *w);
static void window_staff_list_mouseup(rct_window *w, sint32 widgetIndex);
static void window_staff_list_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_staff_list_resize(rct_window *w);
static void window_staff_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_staff_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_staff_list_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_staff_list_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_staff_list_update(rct_window *w);
static void window_staff_list_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_staff_list_toolabort(rct_window *w, sint32 widgetIndex);
static void window_staff_list_tooldown(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_staff_list_toolabort(rct_window *w, rct_widgetindex widgetIndex);
static void window_staff_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_staff_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_staff_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_staff_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_staff_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_staff_list_invalidate(rct_window *w);
static void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -213,7 +213,7 @@ void window_staff_list_close(rct_window *w)
*
* rct2: 0x006BD94C
*/
static void window_staff_list_mouseup(rct_window *w, sint32 widgetIndex)
static void window_staff_list_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_STAFF_LIST_CLOSE:
@ -270,7 +270,7 @@ static void window_staff_list_resize(rct_window *w)
*
* rct2: 0x006BD971
*/
static void window_staff_list_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget)
static void window_staff_list_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget)
{
sint16 newSelectedTab;
@ -299,7 +299,7 @@ static void window_staff_list_mousedown(sint32 widgetIndex, rct_window* w, rct_w
*
* rct2: 0x006BD9A6
*/
static void window_staff_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_staff_list_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex == WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER && dropdownIndex != -1) {
update_staff_colour(_windowStaffListSelectedTab, dropdownIndex);
@ -340,7 +340,7 @@ void window_staff_list_update(rct_window *w)
*
* rct2: 0x006BD990
*/
static void window_staff_list_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_staff_list_tooldown(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
if (widgetIndex == WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON) {
sint32 selectedPeepType = _windowStaffListSelectedTab;
@ -395,7 +395,7 @@ static void window_staff_list_tooldown(rct_window *w, sint32 widgetIndex, sint32
*
* rct2: 0x006BD99B
*/
void window_staff_list_toolabort(rct_window *w, sint32 widgetIndex)
void window_staff_list_toolabort(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON) {
hide_gridlines();
@ -484,7 +484,7 @@ void window_staff_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32
*
* rct2: 0x006BDC90
*/
void window_staff_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
void window_staff_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}

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

@ -50,7 +50,7 @@ static rct_widget window_text_input_widgets[] = {
};
static void window_text_input_close(rct_window *w);
static void window_text_input_mouseup(rct_window *w, sint32 widgetIndex);
static void window_text_input_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_text_input_update7(rct_window *w);
static void window_text_input_text(sint32 key, rct_window* w);
static void window_text_input_invalidate(rct_window *w);
@ -96,7 +96,7 @@ rct_windownumber calling_number = 0;
sint32 calling_widget = 0;
sint32 _maxInputLength;
void window_text_input_open(rct_window* call_w, sint32 call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, sint32 maxLength)
void window_text_input_open(rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, sint32 maxLength)
{
_maxInputLength = maxLength;
@ -155,7 +155,7 @@ void window_text_input_open(rct_window* call_w, sint32 call_widget, rct_string_i
w->colours[2] = call_w->colours[2];
}
void window_text_input_raw_open(rct_window* call_w, sint32 call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, sint32 maxLength)
void window_text_input_raw_open(rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, sint32 maxLength)
{
_maxInputLength = maxLength;
@ -219,7 +219,7 @@ void window_text_input_raw_open(rct_window* call_w, sint32 call_widget, rct_stri
/**
*
*/
static void window_text_input_mouseup(rct_window *w, sint32 widgetIndex)
static void window_text_input_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_window *calling_w;

22
src/openrct2/windows/themes.c
View File

@ -44,16 +44,16 @@ enum {
WINDOW_THEMES_TAB_COUNT
} WINDOW_THEMES_TAB;
static void window_themes_mouseup(rct_window *w, sint32 widgetIndex);
static void window_themes_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_themes_resize(rct_window *w);
static void window_themes_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_themes_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_themes_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_themes_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_themes_update(rct_window *w);
static void window_themes_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_themes_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_themes_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_themes_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_themes_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_themes_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_themes_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_themes_invalidate(rct_window *w);
static void window_themes_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -355,7 +355,7 @@ void window_themes_open()
window->max_height = 107;
}
static void window_themes_mouseup(rct_window *w, sint32 widgetIndex)
static void window_themes_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
size_t activeAvailableThemeIndex;
const utf8 * activeThemeName;
@ -461,7 +461,7 @@ static void window_themes_resize(rct_window *w)
}
}
static void window_themes_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget)
static void window_themes_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget)
{
sint16 newSelectedTab;
sint32 num_items;
@ -538,7 +538,7 @@ static void window_themes_mousedown(sint32 widgetIndex, rct_window* w, rct_widge
}
}
static void window_themes_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_themes_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
switch (widgetIndex) {
case WIDX_THEMES_LIST:
@ -641,7 +641,7 @@ void window_themes_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x,
// return;
}
static void window_themes_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_themes_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (text == NULL || text[0] == 0)
return;
@ -677,7 +677,7 @@ static void window_themes_textinput(rct_window *w, sint32 widgetIndex, char *tex
}
}
void window_themes_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
void window_themes_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
@ -697,7 +697,7 @@ void window_themes_invalidate(rct_window *w)
(1LL << WIDX_THEMES_PROMPTS_TAB) |
(1LL << WIDX_THEMES_FEATURES_TAB)
);
uint8 widgetIndex = _selected_tab + WIDX_THEMES_SETTINGS_TAB;
rct_widgetindex widgetIndex = _selected_tab + WIDX_THEMES_SETTINGS_TAB;
w->pressed_widgets = pressed_widgets | (1 << widgetIndex);

24
src/openrct2/windows/tile_inspector.c
View File

@ -456,15 +456,15 @@ static bool windowTileInspectorApplyToAll = false;
static bool windowTileInspectorElementCopied = false;
static rct_map_element tileInspectorCopiedElement;
static void window_tile_inspector_mouseup(rct_window *w, sint32 widgetIndex);
static void window_tile_inspector_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_tile_inspector_resize(rct_window *w);
static void window_tile_inspector_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget);
static void window_tile_inspector_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget);
static void window_tile_inspector_update(rct_window *w);
static void window_tile_inspector_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_tile_inspector_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_tile_inspector_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_tile_inspector_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_tile_inspector_update_selected_tile(rct_window *w, sint32 x, sint32 y);
static void window_tile_inspector_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_tile_inspector_tool_drag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_tile_inspector_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_tile_inspector_tool_drag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_tile_inspector_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_tile_inspector_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_tile_inspector_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
@ -880,7 +880,7 @@ static void window_tile_inspector_clamp_corrupt(sint32 elementIndex)
);
}
static void window_tile_inspector_mouseup(rct_window *w, sint32 widgetIndex)
static void window_tile_inspector_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -1144,7 +1144,7 @@ static void window_tile_inspector_resize(rct_window *w)
}
}
static void window_tile_inspector_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget)
static void window_tile_inspector_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget)
{
switch (w->page) {
case TILE_INSPECTOR_PAGE_WALL:
@ -1192,7 +1192,7 @@ static void window_tile_inspector_update(rct_window *w)
window_close(w);
}
static void window_tile_inspector_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_tile_inspector_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1) {
return;
@ -1214,7 +1214,7 @@ static void window_tile_inspector_dropdown(rct_window *w, sint32 widgetIndex, si
}
}
static void window_tile_inspector_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_tile_inspector_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
map_invalidate_selection_rect();
@ -1272,12 +1272,12 @@ static void window_tile_inspector_update_selected_tile(rct_window *w, sint32 x,
window_tile_inspector_auto_set_buttons(w);
}
static void window_tile_inspector_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_tile_inspector_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
window_tile_inspector_update_selected_tile(w, x, y);
}
static void window_tile_inspector_tool_drag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_tile_inspector_tool_drag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
window_tile_inspector_update_selected_tile(w, x, y);
}

16
src/openrct2/windows/title_command_editor.c
View File

@ -101,13 +101,13 @@ static rct_widget window_title_command_editor_widgets[] = {
{ WIDGETS_END },
};
static void window_title_command_editor_mouseup(rct_window *w, sint32 widgetIndex);
static void window_title_command_editor_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_title_command_editor_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_title_command_editor_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_title_command_editor_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_title_command_editor_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_title_command_editor_update(rct_window *w);
static void window_title_command_editor_invalidate(rct_window *w);
static void window_title_command_editor_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_title_command_editor_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_title_command_editor_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_title_command_editor_inputsize(rct_window *w);
static sint32 get_command_info_index(sint32 index);
static TITLE_COMMAND_ORDER get_command_info(sint32 index);
@ -248,7 +248,7 @@ void window_title_command_editor_open(TitleSequence * sequence, sint32 index, bo
}
}
static void window_title_command_editor_mouseup(rct_window *w, sint32 widgetIndex)
static void window_title_command_editor_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -302,7 +302,7 @@ static void window_title_command_editor_mouseup(rct_window *w, sint32 widgetInde
}
}
static void window_title_command_editor_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget)
static void window_title_command_editor_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget)
{
widget--;
switch (widgetIndex) {
@ -369,7 +369,7 @@ static void window_title_command_editor_mousedown(sint32 widgetIndex, rct_window
}
}
static void window_title_command_editor_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_title_command_editor_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -433,7 +433,7 @@ static void window_title_command_editor_dropdown(rct_window *w, sint32 widgetInd
}
}
static void window_title_command_editor_textinput(rct_window * w, sint32 widgetIndex, char * text)
static void window_title_command_editor_textinput(rct_window * w, rct_widgetindex widgetIndex, char * text)
{
char * end;
sint32 value = strtol(widgetIndex != WIDX_TEXTBOX_Y ? textbox1Buffer : textbox2Buffer, &end, 10);

22
src/openrct2/windows/title_editor.c
View File

@ -46,16 +46,16 @@ enum WINDOW_TITLE_EDITOR_TAB {
};
static void window_title_editor_close(rct_window *w);
static void window_title_editor_mouseup(rct_window *w, sint32 widgetIndex);
static void window_title_editor_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_title_editor_resize(rct_window *w);
static void window_title_editor_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_title_editor_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_title_editor_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_title_editor_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_title_editor_update(rct_window *w);
static void window_title_editor_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_title_editor_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_title_editor_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_title_editor_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_title_editor_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_title_editor_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_title_editor_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_title_editor_invalidate(rct_window *w);
static void window_title_editor_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -296,7 +296,7 @@ static void window_title_editor_close(rct_window *w)
_renameSavePath = NULL;
}
static void window_title_editor_mouseup(rct_window *w, sint32 widgetIndex)
static void window_title_editor_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
bool commandEditorOpen = (window_find_by_class(WC_TITLE_COMMAND_EDITOR) != NULL);
switch (widgetIndex) {
@ -483,7 +483,7 @@ static void window_title_editor_resize(rct_window *w)
}
}
static void window_title_editor_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget)
static void window_title_editor_mousedown(rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget)
{
switch (widgetIndex) {
case WIDX_TITLE_EDITOR_PRESETS_TAB:
@ -528,7 +528,7 @@ static void window_title_editor_mousedown(sint32 widgetIndex, rct_window* w, rct
}
}
static void window_title_editor_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_title_editor_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -612,7 +612,7 @@ static void window_title_editor_scrollmouseover(rct_window *w, sint32 scrollInde
widget_invalidate(w, WIDX_TITLE_EDITOR_LIST);
}
static void window_title_editor_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_title_editor_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (str_is_null_or_empty(text)) {
return;
@ -649,7 +649,7 @@ static void window_title_editor_textinput(rct_window *w, sint32 widgetIndex, cha
}
}
static void window_title_editor_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_title_editor_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
@ -663,7 +663,7 @@ static void window_title_editor_invalidate(rct_window *w)
(1LL << WIDX_TITLE_EDITOR_SAVES_TAB) |
(1LL << WIDX_TITLE_EDITOR_SCRIPT_TAB)
);
uint8 widgetIndex = w->selected_tab + WIDX_TITLE_EDITOR_PRESETS_TAB;
rct_widgetindex widgetIndex = w->selected_tab + WIDX_TITLE_EDITOR_PRESETS_TAB;
w->pressed_widgets = pressed_widgets | (1 << widgetIndex);

4
src/openrct2/windows/title_exit.c
View File

@ -34,7 +34,7 @@ static rct_widget window_title_exit_widgets[] = {
};
static void window_title_exit_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_title_exit_mouseup(rct_window *w, sint32 widgetIndex);
static void window_title_exit_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_title_exit_invalidate(rct_window *w);
static rct_window_event_list window_title_exit_events = {
@ -92,7 +92,7 @@ void window_title_exit_open()
*
* rct2: 0x0066B83C
*/
static void window_title_exit_mouseup(rct_window *w, sint32 widgetIndex)
static void window_title_exit_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (gIntroState != INTRO_STATE_NONE)
return;

18
src/openrct2/windows/title_menu.c
View File

@ -43,10 +43,10 @@ static rct_widget window_title_menu_widgets[] = {
{ WIDGETS_END },
};
static void window_title_menu_mouseup(rct_window *w, sint32 widgetIndex);
static void window_title_menu_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_title_menu_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_title_menu_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId);
static void window_title_menu_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_title_menu_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_title_menu_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_title_menu_cursor(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y, sint32 *cursorId);
static void window_title_menu_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_title_menu_invalidate(rct_window *w);
@ -108,7 +108,7 @@ void window_title_menu_open()
(1 << WIDX_GAME_TOOLS)
);
sint32 i = 0;
rct_widgetindex i = 0;
sint32 x = 0;
for (rct_widget *widget = window->widgets; widget->type != WWT_LAST; widget++) {
if (widget_is_enabled(window, i)) {
@ -134,7 +134,7 @@ static void window_title_menu_scenarioselect_callback(const utf8 *path)
}
}
static void window_title_menu_mouseup(rct_window *w, sint32 widgetIndex)
static void window_title_menu_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_window *windowToOpen = NULL;
@ -175,7 +175,7 @@ static void window_title_menu_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_title_menu_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_title_menu_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
if (widgetIndex == WIDX_GAME_TOOLS) {
gDropdownItemsFormat[0] = STR_SCENARIO_EDITOR;
@ -193,7 +193,7 @@ static void window_title_menu_mousedown(sint32 widgetIndex, rct_window*w, rct_wi
}
}
static void window_title_menu_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_title_menu_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
if (widgetIndex == WIDX_GAME_TOOLS) {
switch (dropdownIndex) {
@ -213,7 +213,7 @@ static void window_title_menu_dropdown(rct_window *w, sint32 widgetIndex, sint32
}
}
static void window_title_menu_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId)
static void window_title_menu_cursor(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y, sint32 *cursorId)
{
gTooltipTimeout = 2000;
}

4
src/openrct2/windows/title_options.c
View File

@ -32,7 +32,7 @@ static rct_widget window_title_options_widgets[] = {
{ WIDGETS_END },
};
static void window_title_options_mouseup(rct_window *w, sint32 widgetIndex);
static void window_title_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_title_options_invalidate(rct_window *w);
static void window_title_options_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -86,7 +86,7 @@ void window_title_options_open()
window_init_scroll_widgets(window);
}
static void window_title_options_mouseup(rct_window *w, sint32 widgetIndex)
static void window_title_options_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (gIntroState != INTRO_STATE_NONE)
return;

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

@ -96,8 +96,8 @@ static const rct_string_id ScenarioOriginStringIds[] = {
static void window_scenarioselect_init_tabs(rct_window *w);
static void window_scenarioselect_close(rct_window *w);
static void window_scenarioselect_mouseup(rct_window *w, sint32 widgetIndex);
static void window_scenarioselect_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_scenarioselect_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_scenarioselect_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_scenarioselect_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_scenarioselect_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_scenarioselect_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
@ -235,14 +235,14 @@ static void window_scenarioselect_close(rct_window *w)
SafeFree(_listItems);
}
static void window_scenarioselect_mouseup(rct_window *w, sint32 widgetIndex)
static void window_scenarioselect_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE) {
window_close(w);
}
}
static void window_scenarioselect_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_scenarioselect_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
if (widgetIndex >= WIDX_TAB1 && widgetIndex <= WIDX_TAB8) {
w->selected_tab = widgetIndex - 4;

2
src/openrct2/windows/tooltip.c
View File

@ -141,7 +141,7 @@ void window_tooltip_show(rct_string_id id, sint32 x, sint32 y)
*
* rct2: 0x006EA10D
*/
void window_tooltip_open(rct_window *widgetWindow, sint32 widgetIndex, sint32 x, sint32 y)
void window_tooltip_open(rct_window *widgetWindow, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
rct_widget *widget;

2
src/openrct2/windows/tooltip.h
View File

@ -21,7 +21,7 @@
void window_tooltip_reset(sint32 x, sint32 y);
void window_tooltip_show(rct_string_id id, sint32 x, sint32 y);
void window_tooltip_open(rct_window *widgetWindow, sint32 widgetIndex, sint32 x, sint32 y);
void window_tooltip_open(rct_window *widgetWindow, rct_widgetindex widgetIndex, sint32 x, sint32 y);
void window_tooltip_close();
#endif

60
src/openrct2/windows/top_toolbar.c
View File

@ -219,14 +219,14 @@ static rct_widget window_top_toolbar_widgets[] = {
{ WIDGETS_END },
};
static void window_top_toolbar_mouseup(rct_window *w, sint32 widgetIndex);
static void window_top_toolbar_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget);
static void window_top_toolbar_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex);
static void window_top_toolbar_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_top_toolbar_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_top_toolbar_tool_drag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_top_toolbar_tool_up(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_top_toolbar_tool_abort(rct_window *w, sint32 widgetIndex);
static void window_top_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_top_toolbar_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget);
static void window_top_toolbar_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
static void window_top_toolbar_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_top_toolbar_tool_up(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_top_toolbar_tool_abort(rct_window *w, rct_widgetindex widgetIndex);
static void window_top_toolbar_invalidate(rct_window *w);
static void window_top_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -273,9 +273,9 @@ void top_toolbar_init_network_menu(rct_window *window, rct_widget *widget);
void top_toolbar_network_menu_dropdown(sint16 dropdownIndex);
void toggle_footpath_window();
void toggle_land_window(rct_window *topToolbar, sint32 widgetIndex);
void toggle_clear_scenery_window(rct_window *topToolbar, sint32 widgetIndex);
void toggle_water_window(rct_window *topToolbar, sint32 widgetIndex);
void toggle_land_window(rct_window *topToolbar, rct_widgetindex widgetIndex);
void toggle_clear_scenery_window(rct_window *topToolbar, rct_widgetindex widgetIndex);
void toggle_water_window(rct_window *topToolbar, rct_widgetindex widgetIndex);
money32 selection_lower_land(uint8 flags);
money32 selection_raise_land(uint8 flags);
@ -309,7 +309,7 @@ void window_top_toolbar_open()
*
* rct2: 0x0066C957
*/
static void window_top_toolbar_mouseup(rct_window *w, sint32 widgetIndex)
static void window_top_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_window *mainWindow;
@ -379,7 +379,7 @@ static void window_top_toolbar_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x0066CA3B
*/
static void window_top_toolbar_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget)
static void window_top_toolbar_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget)
{
sint32 numItems;
@ -529,7 +529,7 @@ static void window_top_toolbar_scenarioselect_callback(const utf8 *path)
*
* rct2: 0x0066C9EA
*/
static void window_top_toolbar_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex)
static void window_top_toolbar_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex)
{
switch (widgetIndex) {
case WIDX_FILE_MENU:
@ -915,7 +915,7 @@ static void window_top_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi)
*
* rct2: 0x006E3158
*/
static void repaint_scenery_tool_down(sint16 x, sint16 y, sint16 widgetIndex){
static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widgetIndex){
// ax, cx, bl
sint16 grid_x, grid_y;
sint32 type;
@ -1021,7 +1021,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, sint16 widgetIndex){
}
}
static void scenery_eyedropper_tool_down(sint16 x, sint16 y, sint16 widgetIndex)
static void scenery_eyedropper_tool_down(sint16 x, sint16 y, rct_widgetindex widgetIndex)
{
uint16 flags =
VIEWPORT_INTERACTION_MASK_SCENERY &
@ -1548,7 +1548,7 @@ void game_command_callback_place_banner(sint32 eax, sint32 ebx, sint32 ecx, sint
*
* rct2: 0x006E2CC6
*/
static void window_top_toolbar_scenery_tool_down(sint16 x, sint16 y, rct_window *w, sint16 widgetIndex)
static void window_top_toolbar_scenery_tool_down(sint16 x, sint16 y, rct_window *w, rct_widgetindex widgetIndex)
{
scenery_remove_ghost_tool_placement();
if (gWindowSceneryPaintEnabled & 1) {
@ -2646,7 +2646,7 @@ static void top_toolbar_tool_update_scenery(sint16 x, sint16 y){
*
* rct2: 0x0066CB25
*/
static void window_top_toolbar_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_top_toolbar_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex) {
case WIDX_CLEAR_SCENERY:
@ -2671,7 +2671,7 @@ static void window_top_toolbar_tool_update(rct_window* w, sint32 widgetIndex, si
*
* rct2: 0x0066CB73
*/
static void window_top_toolbar_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex){
case WIDX_CLEAR_SCENERY:
@ -2770,8 +2770,8 @@ static void window_top_toolbar_land_tool_drag(sint16 x, sint16 y)
rct_window *window = window_find_from_point(x, y);
if (!window)
return;
sint32 widget_index = window_find_widget_from_point(window, x, y);
if (widget_index == 0xFFFF)
rct_widgetindex widget_index = window_find_widget_from_point(window, x, y);
if (widget_index == -1)
return;
rct_widget *widget = &window->widgets[widget_index];
if (widget->type != WWT_VIEWPORT)
@ -2809,8 +2809,8 @@ static void window_top_toolbar_water_tool_drag(sint16 x, sint16 y)
rct_window *window = window_find_from_point(x, y);
if (!window)
return;
sint32 widget_index = window_find_widget_from_point(window, x, y);
if (widget_index == 0xFFFF)
rct_widgetindex widget_index = window_find_widget_from_point(window, x, y);
if (widget_index == -1)
return;
rct_widget *widget = &window->widgets[widget_index];
if (widget->type != WWT_VIEWPORT)
@ -2871,7 +2871,7 @@ static void window_top_toolbar_water_tool_drag(sint16 x, sint16 y)
*
* rct2: 0x0066CB4E
*/
static void window_top_toolbar_tool_drag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex){
case WIDX_CLEAR_SCENERY:
@ -2931,7 +2931,7 @@ static void window_top_toolbar_tool_drag(rct_window* w, sint32 widgetIndex, sint
*
* rct2: 0x0066CC5B
*/
static void window_top_toolbar_tool_up(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_top_toolbar_tool_up(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
switch (widgetIndex) {
case WIDX_LAND:
@ -2956,7 +2956,7 @@ static void window_top_toolbar_tool_up(rct_window* w, sint32 widgetIndex, sint32
*
* rct2: 0x0066CA58
*/
static void window_top_toolbar_tool_abort(rct_window *w, sint32 widgetIndex)
static void window_top_toolbar_tool_abort(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_LAND:
@ -3295,7 +3295,7 @@ void toggle_footpath_window()
*
* rct2: 0x0066CD54
*/
void toggle_land_window(rct_window *topToolbar, sint32 widgetIndex)
void toggle_land_window(rct_window *topToolbar, rct_widgetindex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR && gCurrentToolWidget.widget_index == WIDX_LAND) {
tool_cancel();
@ -3312,7 +3312,7 @@ void toggle_land_window(rct_window *topToolbar, sint32 widgetIndex)
*
* rct2: 0x0066CD0C
*/
void toggle_clear_scenery_window(rct_window *topToolbar, sint32 widgetIndex)
void toggle_clear_scenery_window(rct_window *topToolbar, rct_widgetindex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR && gCurrentToolWidget.widget_index == WIDX_CLEAR_SCENERY)) {
tool_cancel();
@ -3329,7 +3329,7 @@ void toggle_clear_scenery_window(rct_window *topToolbar, sint32 widgetIndex)
*
* rct2: 0x0066CD9C
*/
void toggle_water_window(rct_window *topToolbar, sint32 widgetIndex)
void toggle_water_window(rct_window *topToolbar, rct_widgetindex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR && gCurrentToolWidget.widget_index == WIDX_WATER) {
tool_cancel();
@ -3390,7 +3390,7 @@ bool land_rights_tool_is_active()
bool scenery_tool_is_active()
{
sint32 toolWindowClassification = gCurrentToolWidget.window_classification;
sint32 toolWidgetIndex = gCurrentToolWidget.widget_index;
rct_widgetindex toolWidgetIndex = gCurrentToolWidget.widget_index;
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
if (toolWindowClassification == WC_TOP_TOOLBAR && toolWidgetIndex == WIDX_SCENERY)
return true;

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

@ -56,12 +56,12 @@ static rct_widget window_track_list_widgets[] = {
};
static void window_track_list_close(rct_window *w);
static void window_track_list_mouseup(rct_window *w, sint32 widgetIndex);
static void window_track_list_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_track_list_update(rct_window *w);
static void window_track_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
static void window_track_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_track_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
static void window_track_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId);
static void window_track_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_track_list_invalidate(rct_window *w);
static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
@ -237,7 +237,7 @@ static sint32 window_track_list_get_list_item_index_from_position(sint32 x, sint
*
* rct2: 0x006CFA31
*/
static void window_track_list_mouseup(rct_window *w, sint32 widgetIndex)
static void window_track_list_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -319,7 +319,7 @@ static void window_track_list_scrollmouseover(rct_window *w, sint32 scrollIndex,
*
* rct2: 0x006CFD6C
*/
static void window_track_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId)
static void window_track_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}

12
src/openrct2/windows/track_manage.c
View File

@ -62,12 +62,12 @@ static rct_widget window_track_delete_prompt_widgets[] = {
#pragma region Events
static void window_track_manage_close(rct_window *w);
static void window_track_manage_mouseup(rct_window *w, sint32 widgetIndex);
static void window_track_manage_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_track_manage_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_track_manage_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_track_manage_invalidate(rct_window *w);
static void window_track_manage_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_track_delete_prompt_mouseup(rct_window *w, sint32 widgetIndex);
static void window_track_delete_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_track_delete_prompt_invalidate(rct_window *w);
static void window_track_delete_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -188,7 +188,7 @@ static void window_track_manage_close(rct_window *w)
*
* rct2: 0x006D3523
*/
static void window_track_manage_mouseup(rct_window *w, sint32 widgetIndex)
static void window_track_manage_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -214,7 +214,7 @@ static void window_track_manage_mouseup(rct_window *w, sint32 widgetIndex)
*
* rct2: 0x006D3523
*/
static void window_track_manage_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_track_manage_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
if (widgetIndex != WIDX_RENAME || str_is_null_or_empty(text)) {
return;
@ -286,7 +286,7 @@ static void window_track_delete_prompt_open()
*
* rct2: 0x006D3823
*/
static void window_track_delete_prompt_mouseup(rct_window *w, sint32 widgetIndex)
static void window_track_delete_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:

16
src/openrct2/windows/track_place.c
View File

@ -62,11 +62,11 @@ static rct_widget window_track_place_widgets[] = {
};
static void window_track_place_close(rct_window *w);
static void window_track_place_mouseup(rct_window *w, sint32 widgetIndex);
static void window_track_place_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_track_place_update(rct_window *w);
static void window_track_place_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_track_place_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y);
static void window_track_place_toolabort(rct_window *w, sint32 widgetIndex);
static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_track_place_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
static void window_track_place_toolabort(rct_window *w, rct_widgetindex widgetIndex);
static void window_track_place_unknown14(rct_window *w);
static void window_track_place_invalidate(rct_window *w);
static void window_track_place_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -203,7 +203,7 @@ static void window_track_place_close(rct_window *w)
*
* rct2: 0x006CFEAC
*/
static void window_track_place_mouseup(rct_window *w, sint32 widgetIndex)
static void window_track_place_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -245,7 +245,7 @@ static void window_track_place_update(rct_window *w)
*
* rct2: 0x006CFF2D
*/
static void window_track_place_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_track_place_toolupdate(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
sint16 mapX, mapY, mapZ;
@ -304,7 +304,7 @@ static void window_track_place_toolupdate(rct_window* w, sint32 widgetIndex, sin
*
* rct2: 0x006CFF34
*/
static void window_track_place_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y)
static void window_track_place_tooldown(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y)
{
sint32 i;
sint16 mapX, mapY, mapZ;
@ -359,7 +359,7 @@ static void window_track_place_tooldown(rct_window* w, sint32 widgetIndex, sint3
*
* rct2: 0x006D015C
*/
static void window_track_place_toolabort(rct_window *w, sint32 widgetIndex)
static void window_track_place_toolabort(rct_window *w, rct_widgetindex widgetIndex)
{
window_track_place_clear_provisional();
}

4
src/openrct2/windows/view_clipping.c
View File

@ -63,7 +63,7 @@ rct_widget window_view_clipping_widgets[] = {
#pragma region Events
static void window_view_clipping_close_button(rct_window *w);
static void window_view_clipping_mouseup(rct_window *w, int widgetIndex);
static void window_view_clipping_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_view_clipping_update(rct_window *w);
static void window_view_clipping_invalidate(rct_window *w);
static void window_view_clipping_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -172,7 +172,7 @@ static void window_view_clipping_close_button(rct_window *w)
window_view_clipping_close();
}
static void window_view_clipping_mouseup(rct_window *w, int widgetIndex)
static void window_view_clipping_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_window *mainWindow;

4
src/openrct2/windows/viewport.c
View File

@ -52,7 +52,7 @@ static rct_widget window_viewport_widgets[] = {
{ WIDGETS_END },
};
static void window_viewport_mouseup(rct_window *w, sint32 widgetIndex);
static void window_viewport_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_viewport_resize(rct_window *w);
static void window_viewport_update(rct_window *w);
static void window_viewport_invalidate(rct_window *w);
@ -135,7 +135,7 @@ static void window_viewport_anchor_border_widgets(rct_window *w)
w->widgets[WIDX_CLOSE].right = w->width - 3;
}
static void window_viewport_mouseup(rct_window *w, sint32 widgetIndex)
static void window_viewport_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
rct_window *mainWindow;
sint16 x, y;

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

@ -48,11 +48,11 @@ static rct_widget window_water_widgets[] = {
};
static void window_water_close(rct_window *w);
static void window_water_mouseup(rct_window *w, sint32 widgetIndex);
static void window_water_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_water_update(rct_window *w);
static void window_water_invalidate(rct_window *w);
static void window_water_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_water_textinput(rct_window *w, sint32 widgetIndex, char *text);
static void window_water_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_water_inputsize(rct_window *w);
static rct_window_event_list window_water_events = {
@ -131,7 +131,7 @@ static void window_water_close(rct_window *w)
*
* rct2: 0x006E6B4E
*/
static void window_water_mouseup(rct_window *w, sint32 widgetIndex)
static void window_water_mouseup(rct_window *w, rct_widgetindex widgetIndex)
{
switch (widgetIndex) {
case WIDX_CLOSE:
@ -157,7 +157,7 @@ static void window_water_mouseup(rct_window *w, sint32 widgetIndex)
}
}
static void window_water_textinput(rct_window *w, sint32 widgetIndex, char *text)
static void window_water_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text)
{
sint32 size;
char* end;