mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

Merge pull request #10131 from tupaschoal/screencoords-for-tool-functions

Browse Source 
Use ScreenCoordsXY for tool_* functions
This commit is contained in:
Duncan
2019-10-30 06:29:07 +00:00
committed by GitHub
parent f5c9131f23 afc14183e7
commit 3362cbc366
16 changed files with 168 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/interface/Window.cpp
View File

@@ -1436,25 +1436,25 @@ void window_event_unknown_08_call(rct_window* w)
void window_event_tool_update_call(rct_window* w, rct_widgetindex widgetIndex, ScreenCoordsXY screenCoords)
{
if (w->event_handlers->tool_update != nullptr)
w->event_handlers->tool_update(w, widgetIndex, screenCoords.x, screenCoords.y);
w->event_handlers->tool_update(w, widgetIndex, screenCoords);
}
void window_event_tool_down_call(rct_window* w, rct_widgetindex widgetIndex, ScreenCoordsXY screenCoords)
{
if (w->event_handlers->tool_down != nullptr)
w->event_handlers->tool_down(w, widgetIndex, screenCoords.x, screenCoords.y);
w->event_handlers->tool_down(w, widgetIndex, screenCoords);
}
void window_event_tool_drag_call(rct_window* w, rct_widgetindex widgetIndex, ScreenCoordsXY screenCoords)
{
if (w->event_handlers->tool_drag != nullptr)
w->event_handlers->tool_drag(w, widgetIndex, screenCoords.x, screenCoords.y);
w->event_handlers->tool_drag(w, widgetIndex, screenCoords);
}
void window_event_tool_up_call(rct_window* w, rct_widgetindex widgetIndex, ScreenCoordsXY screenCoords)
{
if (w->event_handlers->tool_up != nullptr)
w->event_handlers->tool_up(w, widgetIndex, screenCoords.x, screenCoords.y);
w->event_handlers->tool_up(w, widgetIndex, screenCoords);
}
void window_event_tool_abort_call(rct_window* w, rct_widgetindex widgetIndex)

8
src/openrct2/interface/Window.h
View File

@@ -180,10 +180,10 @@ struct rct_window_event_list
void (*update)(struct rct_window*);
void (*periodic_update)(struct rct_window*);
void (*unknown_08)(struct rct_window*);
void (*tool_update)(struct rct_window*, rct_widgetindex, int32_t, int32_t);
void (*tool_down)(struct rct_window*, rct_widgetindex, int32_t, int32_t);
void (*tool_drag)(struct rct_window*, rct_widgetindex, int32_t, int32_t);
void (*tool_up)(struct rct_window*, rct_widgetindex, int32_t, int32_t);
void (*tool_update)(struct rct_window*, rct_widgetindex, ScreenCoordsXY);
void (*tool_down)(struct rct_window*, rct_widgetindex, ScreenCoordsXY);
void (*tool_drag)(struct rct_window*, rct_widgetindex, ScreenCoordsXY);
void (*tool_up)(struct rct_window*, rct_widgetindex, ScreenCoordsXY);
void (*tool_abort)(struct rct_window*, rct_widgetindex);
void (*unknown_0E)(struct rct_window*);
void (*get_scroll_size)(struct rct_window*, int32_t, int32_t*, int32_t*);