From 68756498f8917613b343542e33cc9ebdb4627475 Mon Sep 17 00:00:00 2001 From: wolfreak99 Date: Fri, 14 Jul 2017 13:20:42 -0400 Subject: [PATCH] Fixed rebase --- src/openrct2/windows/clear_scenery.c | 4 ++-- src/openrct2/windows/land_rights.c | 4 ++-- src/openrct2/windows/water.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2/windows/clear_scenery.c b/src/openrct2/windows/clear_scenery.c index 0c4bb50535..4a2ce6f8d4 100644 --- a/src/openrct2/windows/clear_scenery.c +++ b/src/openrct2/windows/clear_scenery.c @@ -54,7 +54,7 @@ rct_widget window_clear_scenery_widgets[] = { static void window_clear_scenery_close(rct_window *w); static void window_clear_scenery_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_clear_scenery_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget); +static void window_clear_scenery_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget); 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); @@ -159,7 +159,7 @@ static void window_clear_scenery_mouseup(rct_window *w, rct_widgetindex widgetIn } } -static void window_clear_scenery_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget) +static void window_clear_scenery_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget) { switch (widgetIndex) { case WIDX_DECREMENT: diff --git a/src/openrct2/windows/land_rights.c b/src/openrct2/windows/land_rights.c index f8a547d57f..078d1ff2c1 100644 --- a/src/openrct2/windows/land_rights.c +++ b/src/openrct2/windows/land_rights.c @@ -53,7 +53,7 @@ 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, rct_widgetindex widgetIndex); -static void window_land_rights_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget); +static void window_land_rights_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget); 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); @@ -178,7 +178,7 @@ static void window_land_rights_mouseup(rct_window *w, rct_widgetindex widgetInde } } -static void window_land_rights_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget) +static void window_land_rights_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget) { switch (widgetIndex) { case WIDX_DECREMENT: diff --git a/src/openrct2/windows/water.c b/src/openrct2/windows/water.c index 82eae1ad21..9fd8f2deb0 100644 --- a/src/openrct2/windows/water.c +++ b/src/openrct2/windows/water.c @@ -47,7 +47,7 @@ static rct_widget window_water_widgets[] = { static void window_water_close(rct_window *w); static void window_water_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_water_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget *widget); +static void window_water_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget); 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); @@ -144,7 +144,7 @@ static void window_water_mouseup(rct_window *w, rct_widgetindex widgetIndex) } } -static void window_water_mousedown(rct_widgetindex widgetIndex, rct_window *w, rct_widget* widget) +static void window_water_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget) { switch (widgetIndex) { case WIDX_DECREMENT: