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

Rename rct_widgetindex to WidgetIndex

This commit is contained in:
Gymnasiast 2022-08-21 18:49:23 +02:00
parent 7f29e4e39c
commit a088537b65
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
87 changed files with 768 additions and 770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/openrct2-ui/input/MouseInput.cpp
View File

@ -62,8 +62,8 @@ ScreenCoordsXY gTooltipCursor;
static int16_t _clickRepeatTicks;
static MouseState GameGetNextInput(ScreenCoordsXY& screenCoords);
static void InputWidgetOver(const ScreenCoordsXY& screenCoords, rct_window* w, rct_widgetindex widgetIndex);
static void InputWidgetOverChangeCheck(WindowClass windowClass, rct_windownumber windowNumber, rct_widgetindex widgetIndex);
static void InputWidgetOver(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex);
static void InputWidgetOverChangeCheck(WindowClass windowClass, rct_windownumber windowNumber, WidgetIndex widgetIndex);
static void InputWidgetOverFlatbuttonInvalidate();
void ProcessMouseOver(const ScreenCoordsXY& screenCoords);
void ProcessMouseTool(const ScreenCoordsXY& screenCoords);
@ -71,29 +71,29 @@ void InvalidateScroll();
static RCTMouseData* GetMouseInput();
void TileElementRightClick(int32_t type, TileElement* tileElement, const ScreenCoordsXY& screenCoords);
static void GameHandleInputMouse(const ScreenCoordsXY& screenCoords, MouseState state);
static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, rct_widgetindex widgetIndex);
static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex);
void InputStateWidgetPressed(
const ScreenCoordsXY& screenCoords, MouseState state, rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget);
const ScreenCoordsXY& screenCoords, MouseState state, WidgetIndex widgetIndex, rct_window* w, rct_widget* widget);
void SetCursor(CursorID cursor_id);
static void InputWindowPositionContinue(
rct_window& w, const ScreenCoordsXY& lastScreenCoords, const ScreenCoordsXY& newScreenCoords);
static void InputWindowPositionEnd(rct_window& w, const ScreenCoordsXY& screenCoords);
static void InputWindowResizeBegin(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void InputWindowResizeBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void InputWindowResizeContinue(rct_window& w, const ScreenCoordsXY& screenCoords);
static void InputWindowResizeEnd();
static void InputViewportDragBegin(rct_window& w);
static void InputViewportDragContinue();
static void InputViewportDragEnd();
static void InputScrollBegin(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void InputScrollContinue(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void InputScrollBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void InputScrollContinue(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void InputScrollEnd();
static void InputScrollPartUpdateHThumb(rct_window& w, rct_widgetindex widgetIndex, int32_t x, int32_t scroll_id);
static void InputScrollPartUpdateHLeft(rct_window& w, rct_widgetindex widgetIndex, int32_t scroll_id);
static void InputScrollPartUpdateHRight(rct_window& w, rct_widgetindex widgetIndex, int32_t scroll_id);
static void InputScrollPartUpdateVThumb(rct_window& w, rct_widgetindex widgetIndex, int32_t y, int32_t scroll_id);
static void InputScrollPartUpdateVTop(rct_window& w, rct_widgetindex widgetIndex, int32_t scroll_id);
static void InputScrollPartUpdateVBottom(rct_window& w, rct_widgetindex widgetIndex, int32_t scroll_id);
static void InputUpdateTooltip(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void InputScrollPartUpdateHThumb(rct_window& w, WidgetIndex widgetIndex, int32_t x, int32_t scroll_id);
static void InputScrollPartUpdateHLeft(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id);
static void InputScrollPartUpdateHRight(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id);
static void InputScrollPartUpdateVThumb(rct_window& w, WidgetIndex widgetIndex, int32_t y, int32_t scroll_id);
static void InputScrollPartUpdateVTop(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id);
static void InputScrollPartUpdateVBottom(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id);
static void InputUpdateTooltip(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
#pragma region Mouse input
@ -173,7 +173,7 @@ static RCTMouseData* GetMouseInput()
*
* rct2: 0x006E957F
*/
static void InputScrollDragBegin(const ScreenCoordsXY& screenCoords, rct_window* w, rct_widgetindex widgetIndex)
static void InputScrollDragBegin(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex)
{
_inputState = InputState::ScrollRight;
gInputDragLast = screenCoords;
@ -192,7 +192,7 @@ static void InputScrollDragBegin(const ScreenCoordsXY& screenCoords, rct_window*
*/
static void InputScrollDragContinue(const ScreenCoordsXY& screenCoords, rct_window* w)
{
rct_widgetindex widgetIndex = _dragWidget.widget_index;
WidgetIndex widgetIndex = _dragWidget.widget_index;
uint8_t scrollIndex = _dragScrollIndex;
const auto& widget = w->widgets[widgetIndex];
@ -271,7 +271,7 @@ static void GameHandleInputMouse(const ScreenCoordsXY& screenCoords, MouseState
{
rct_window* w;
rct_widget* widget;
rct_widgetindex widgetIndex;
WidgetIndex widgetIndex;
// Get window and widget under cursor position
w = window_find_from_point(screenCoords);
@ -459,7 +459,7 @@ static void GameHandleInputMouse(const ScreenCoordsXY& screenCoords, MouseState
#pragma region Window positioning / resizing
void InputWindowPositionBegin(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void InputWindowPositionBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
_inputState = InputState::PositioningWindow;
gInputDragLast = screenCoords - w.windowPos;
@ -485,7 +485,7 @@ static void InputWindowPositionEnd(rct_window& w, const ScreenCoordsXY& screenCo
window_event_moved_call(&w, screenCoords);
}
static void InputWindowResizeBegin(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void InputWindowResizeBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
_inputState = InputState::Resizing;
gInputDragLast = screenCoords;
@ -603,7 +603,7 @@ static void InputViewportDragEnd()
#pragma region Scroll bars
static void InputScrollBegin(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void InputScrollBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
const auto& widget = w.widgets[widgetIndex];
@ -673,7 +673,7 @@ static void InputScrollBegin(rct_window& w, rct_widgetindex widgetIndex, const S
window_invalidate_by_number(w.classification, w.number);
}
static void InputScrollContinue(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void InputScrollContinue(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
int32_t scroll_part, scroll_id;
@ -740,7 +740,7 @@ static void InputScrollEnd()
*
* rct2: 0x006E98F2
*/
static void InputScrollPartUpdateHThumb(rct_window& w, rct_widgetindex widgetIndex, int32_t x, int32_t scroll_id)
static void InputScrollPartUpdateHThumb(rct_window& w, WidgetIndex widgetIndex, int32_t x, int32_t scroll_id)
{
const auto& widget = w.widgets[widgetIndex];
auto& scroll = w.scrolls[scroll_id];
@ -779,7 +779,7 @@ static void InputScrollPartUpdateHThumb(rct_window& w, rct_widgetindex widgetInd
*
* rct2: 0x006E99A9
*/
static void InputScrollPartUpdateVThumb(rct_window& w, rct_widgetindex widgetIndex, int32_t y, int32_t scroll_id)
static void InputScrollPartUpdateVThumb(rct_window& w, WidgetIndex widgetIndex, int32_t y, int32_t scroll_id)
{
const auto& widget = w.widgets[widgetIndex];
auto& scroll = w.scrolls[scroll_id];
@ -818,7 +818,7 @@ static void InputScrollPartUpdateVThumb(rct_window& w, rct_widgetindex widgetInd
*
* rct2: 0x006E9A60
*/
static void InputScrollPartUpdateHLeft(rct_window& w, rct_widgetindex widgetIndex, int32_t scroll_id)
static void InputScrollPartUpdateHLeft(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id)
{
if (window_find_by_number(w.classification, w.number) != nullptr)
{
@ -835,7 +835,7 @@ static void InputScrollPartUpdateHLeft(rct_window& w, rct_widgetindex widgetInde
*
* rct2: 0x006E9ABF
*/
static void InputScrollPartUpdateHRight(rct_window& w, rct_widgetindex widgetIndex, int32_t scroll_id)
static void InputScrollPartUpdateHRight(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id)
{
const auto& widget = w.widgets[widgetIndex];
if (window_find_by_number(w.classification, w.number) != nullptr)
@ -861,7 +861,7 @@ static void InputScrollPartUpdateHRight(rct_window& w, rct_widgetindex widgetInd
*
* rct2: 0x006E9C37
*/
static void InputScrollPartUpdateVTop(rct_window& w, rct_widgetindex widgetIndex, int32_t scroll_id)
static void InputScrollPartUpdateVTop(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id)
{
if (window_find_by_number(w.classification, w.number) != nullptr)
{
@ -878,7 +878,7 @@ static void InputScrollPartUpdateVTop(rct_window& w, rct_widgetindex widgetIndex
*
* rct2: 0x006E9C96
*/
static void InputScrollPartUpdateVBottom(rct_window& w, rct_widgetindex widgetIndex, int32_t scroll_id)
static void InputScrollPartUpdateVBottom(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id)
{
const auto& widget = w.widgets[widgetIndex];
if (window_find_by_number(w.classification, w.number) != nullptr)
@ -908,7 +908,7 @@ static void InputScrollPartUpdateVBottom(rct_window& w, rct_widgetindex widgetIn
*
* rct2: 0x006E9253
*/
static void InputWidgetOver(const ScreenCoordsXY& screenCoords, rct_window* w, rct_widgetindex widgetIndex)
static void InputWidgetOver(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex)
{
WindowClass windowClass = WindowClass::Null;
rct_windownumber windowNumber = 0;
@ -947,7 +947,7 @@ static void InputWidgetOver(const ScreenCoordsXY& screenCoords, rct_window* w, r
*
* rct2: 0x006E9269
*/
static void InputWidgetOverChangeCheck(WindowClass windowClass, rct_windownumber windowNumber, rct_widgetindex widgetIndex)
static void InputWidgetOverChangeCheck(WindowClass windowClass, rct_windownumber windowNumber, WidgetIndex widgetIndex)
{
// Prevents invalid widgets being clicked source of bug is elsewhere
if (widgetIndex == -1)
@ -993,7 +993,7 @@ static void InputWidgetOverFlatbuttonInvalidate()
*
* rct2: 0x006E95F9
*/
static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, rct_widgetindex widgetIndex)
static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex)
{
WindowClass windowClass = WindowClass::Null;
rct_windownumber windowNumber = 0;
@ -1091,7 +1091,7 @@ void ProcessMouseOver(const ScreenCoordsXY& screenCoords)
if (window != nullptr)
{
rct_widgetindex widgetId = window_find_widget_from_point(*window, screenCoords);
WidgetIndex widgetId = window_find_widget_from_point(*window, screenCoords);
if (widgetId != -1)
{
switch (window->widgets[widgetId].type)
@ -1178,13 +1178,13 @@ void ProcessMouseTool(const ScreenCoordsXY& screenCoords)
* rct2: 0x006E8DA7
*/
void InputStateWidgetPressed(
const ScreenCoordsXY& screenCoords, MouseState state, rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget)
const ScreenCoordsXY& screenCoords, MouseState state, WidgetIndex widgetIndex, rct_window* w, rct_widget* widget)
{
WindowClass cursor_w_class;
rct_windownumber cursor_w_number;
cursor_w_class = gPressedWidget.window_classification;
cursor_w_number = gPressedWidget.window_number;
rct_widgetindex cursor_widgetIndex = gPressedWidget.widget_index;
WidgetIndex cursor_widgetIndex = gPressedWidget.widget_index;
rct_window* cursor_w = window_find_by_number(cursor_w_class, cursor_w_number);
if (cursor_w == nullptr)
@ -1427,7 +1427,7 @@ void InputStateWidgetPressed(
}
}
static void InputUpdateTooltip(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void InputUpdateTooltip(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (gTooltipWidget.window_classification == WindowClass::Null)
{

4
src/openrct2-ui/input/Shortcuts.cpp
View File

@ -491,7 +491,7 @@ static void ShortcutScaleDown()
}
// Tile inspector shortcuts
static void TileInspectorMouseUp(rct_widgetindex widgetIndex)
static void TileInspectorMouseUp(WidgetIndex widgetIndex)
{
auto w = window_find_by_class(WindowClass::TileInspector);
if (w != nullptr && !WidgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WindowWidgetType::Empty)
@ -500,7 +500,7 @@ static void TileInspectorMouseUp(rct_widgetindex widgetIndex)
}
}
static void TileInspectorMouseDown(rct_widgetindex widgetIndex)
static void TileInspectorMouseDown(WidgetIndex widgetIndex)
{
auto w = window_find_by_class(WindowClass::TileInspector);
if (w != nullptr && !WidgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WindowWidgetType::Empty)

96
src/openrct2-ui/interface/Widget.cpp
View File

@ -21,32 +21,32 @@
#include <openrct2/sprites.h>
#include <openrct2/util/Util.h>
static void WidgetFrameDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetResizeDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetTabDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetFlatButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetTextButton(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetTextCentred(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetText(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetTextInset(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetTextBoxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetGroupboxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetCaptionDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetCheckboxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetCloseboxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetScrollDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetFrameDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetResizeDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetTabDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetFlatButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetTextButton(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetTextCentred(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetText(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetTextInset(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetTextBoxDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetGroupboxDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetCaptionDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetCheckboxDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetCloseboxDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetScrollDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
static void WidgetHScrollbarDraw(
rct_drawpixelinfo* dpi, const rct_scroll& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour);
static void WidgetVScrollbarDraw(
rct_drawpixelinfo* dpi, const rct_scroll& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour);
static void WidgetDrawImage(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
static void WidgetDrawImage(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
/**
*
* rct2: 0x006EB2A8
*/
void WidgetDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
void WidgetDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
const auto* widget = GetWidgetByIndex(w, widgetIndex);
if (widget == nullptr)
@ -116,7 +116,7 @@ void WidgetDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetInd
*
* rct2: 0x006EB6CE
*/
static void WidgetFrameDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetFrameDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -150,7 +150,7 @@ static void WidgetFrameDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetind
*
* rct2: 0x006EB765
*/
static void WidgetResizeDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetResizeDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -181,7 +181,7 @@ static void WidgetResizeDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetin
*
* rct2: 0x006EB8E5
*/
static void WidgetButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -213,7 +213,7 @@ static void WidgetButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetin
*
* rct2: 0x006EB806
*/
static void WidgetTabDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetTabDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
auto& widget = w.widgets[widgetIndex];
@ -261,7 +261,7 @@ static void WidgetTabDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex
*
* rct2: 0x006EB861
*/
static void WidgetFlatButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetFlatButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
if (!WidgetIsDisabled(w, widgetIndex) && WidgetIsHighlighted(w, widgetIndex))
{
@ -301,7 +301,7 @@ static void WidgetFlatButtonDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widg
*
* rct2: 0x006EBBEB
*/
static void WidgetTextButton(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetTextButton(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -332,7 +332,7 @@ static void WidgetTextButton(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetin
*
* rct2: 0x006EBC41
*/
static void WidgetTextCentred(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetTextCentred(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -378,7 +378,7 @@ static void WidgetTextCentred(rct_drawpixelinfo* dpi, rct_window& w, rct_widgeti
*
* rct2: 0x006EBD52
*/
static void WidgetText(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetText(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -427,7 +427,7 @@ static void WidgetText(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex wi
*
* rct2: 0x006EBD1F
*/
static void WidgetTextInset(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetTextInset(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -467,7 +467,7 @@ static std::pair<StringId, void*> WidgetGetStringidAndArgs(const rct_widget& wid
*
* rct2: 0x006EB535
*/
static void WidgetGroupboxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetGroupboxDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -528,7 +528,7 @@ static void WidgetGroupboxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widget
*
* rct2: 0x006EB2F9
*/
static void WidgetCaptionDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetCaptionDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto* widget = &w.widgets[widgetIndex];
@ -576,7 +576,7 @@ static void WidgetCaptionDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgeti
*
* rct2: 0x006EBB85
*/
static void WidgetCloseboxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetCloseboxDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -613,7 +613,7 @@ static void WidgetCloseboxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widget
*
* rct2: 0x006EBAD9
*/
static void WidgetCheckboxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetCheckboxDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -654,7 +654,7 @@ static void WidgetCheckboxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widget
*
* rct2: 0x006EBD96
*/
static void WidgetScrollDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetScrollDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
int32_t scrollIndex = window_get_scroll_data_index(w, widgetIndex);
@ -796,7 +796,7 @@ static void WidgetVScrollbarDraw(
*
* rct2: 0x006EB951
*/
static void WidgetDrawImage(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetDrawImage(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
// Get the widget
const auto& widget = w.widgets[widgetIndex];
@ -845,26 +845,26 @@ static void WidgetDrawImage(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetind
}
}
bool WidgetIsDisabled(const rct_window& w, rct_widgetindex widgetIndex)
bool WidgetIsDisabled(const rct_window& w, WidgetIndex widgetIndex)
{
if (w.classification == WindowClass::Custom)
return w.widgets[widgetIndex].flags & WIDGET_FLAGS::IS_DISABLED;
return (w.disabled_widgets & (1LL << widgetIndex)) != 0;
}
bool WidgetIsHoldable(const rct_window& w, rct_widgetindex widgetIndex)
bool WidgetIsHoldable(const rct_window& w, WidgetIndex widgetIndex)
{
if (w.classification == WindowClass::Custom)
return w.widgets[widgetIndex].flags & WIDGET_FLAGS::IS_HOLDABLE;
return (w.hold_down_widgets & (1LL << widgetIndex)) != 0;
}
bool WidgetIsVisible(const rct_window& w, rct_widgetindex widgetIndex)
bool WidgetIsVisible(const rct_window& w, WidgetIndex widgetIndex)
{
return w.widgets[widgetIndex].IsVisible();
}
bool WidgetIsPressed(const rct_window& w, rct_widgetindex widgetIndex)
bool WidgetIsPressed(const rct_window& w, WidgetIndex widgetIndex)
{
if (w.classification == WindowClass::Custom)
{
@ -896,7 +896,7 @@ bool WidgetIsPressed(const rct_window& w, rct_widgetindex widgetIndex)
return false;
}
bool WidgetIsHighlighted(const rct_window& w, rct_widgetindex widgetIndex)
bool WidgetIsHighlighted(const rct_window& w, WidgetIndex widgetIndex)
{
if (gHoverWidget.window_classification != w.classification)
return false;
@ -907,7 +907,7 @@ bool WidgetIsHighlighted(const rct_window& w, rct_widgetindex widgetIndex)
return true;
}
bool WidgetIsActiveTool(const rct_window& w, rct_widgetindex widgetIndex)
bool WidgetIsActiveTool(const rct_window& w, WidgetIndex widgetIndex)
{
if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)))
return false;
@ -1036,10 +1036,10 @@ void WidgetScrollGetPart(
}
}
rct_widget* GetWidgetByIndex(const rct_window& w, rct_widgetindex widgetIndex)
rct_widget* GetWidgetByIndex(const rct_window& w, WidgetIndex widgetIndex)
{
// Make sure we don't go out of bounds if we are given a bad widget index
rct_widgetindex index = 0;
WidgetIndex index = 0;
for (auto* widget = w.widgets; widget->type != WindowWidgetType::Last; widget++)
{
if (index == widgetIndex)
@ -1054,7 +1054,7 @@ rct_widget* GetWidgetByIndex(const rct_window& w, rct_widgetindex widgetIndex)
return nullptr;
}
static void SafeSetWidgetFlag(rct_window& w, rct_widgetindex widgetIndex, WidgetFlags mask, bool value)
static void SafeSetWidgetFlag(rct_window& w, WidgetIndex widgetIndex, WidgetFlags mask, bool value)
{
rct_widget* widget = GetWidgetByIndex(w, widgetIndex);
if (widget == nullptr)
@ -1068,12 +1068,12 @@ static void SafeSetWidgetFlag(rct_window& w, rct_widgetindex widgetIndex, Widget
widget->flags &= ~mask;
}
void WidgetSetEnabled(rct_window& w, rct_widgetindex widgetIndex, bool enabled)
void WidgetSetEnabled(rct_window& w, WidgetIndex widgetIndex, bool enabled)
{
WidgetSetDisabled(w, widgetIndex, !enabled);
}
void WidgetSetDisabled(rct_window& w, rct_widgetindex widgetIndex, bool value)
void WidgetSetDisabled(rct_window& w, WidgetIndex widgetIndex, bool value)
{
SafeSetWidgetFlag(w, widgetIndex, WIDGET_FLAGS::IS_DISABLED, value);
if (value)
@ -1086,7 +1086,7 @@ void WidgetSetDisabled(rct_window& w, rct_widgetindex widgetIndex, bool value)
}
}
void WidgetSetHoldable(rct_window& w, rct_widgetindex widgetIndex, bool value)
void WidgetSetHoldable(rct_window& w, WidgetIndex widgetIndex, bool value)
{
SafeSetWidgetFlag(w, widgetIndex, WIDGET_FLAGS::IS_HOLDABLE, value);
if (value)
@ -1099,12 +1099,12 @@ void WidgetSetHoldable(rct_window& w, rct_widgetindex widgetIndex, bool value)
}
}
void WidgetSetVisible(rct_window& w, rct_widgetindex widgetIndex, bool value)
void WidgetSetVisible(rct_window& w, WidgetIndex widgetIndex, bool value)
{
SafeSetWidgetFlag(w, widgetIndex, WIDGET_FLAGS::IS_HIDDEN, !value);
}
void WidgetSetPressed(rct_window& w, rct_widgetindex widgetIndex, bool value)
void WidgetSetPressed(rct_window& w, WidgetIndex widgetIndex, bool value)
{
SafeSetWidgetFlag(w, widgetIndex, WIDGET_FLAGS::IS_PRESSED, value);
if (value)
@ -1113,12 +1113,12 @@ void WidgetSetPressed(rct_window& w, rct_widgetindex widgetIndex, bool value)
w.pressed_widgets &= ~(1ULL << widgetIndex);
}
void WidgetSetCheckboxValue(rct_window& w, rct_widgetindex widgetIndex, bool value)
void WidgetSetCheckboxValue(rct_window& w, WidgetIndex widgetIndex, bool value)
{
WidgetSetPressed(w, widgetIndex, value);
}
static void WidgetTextBoxDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex)
static void WidgetTextBoxDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex)
{
int32_t no_lines = 0;
char wrapped_string[TEXT_INPUT_SIZE];

2
src/openrct2-ui/interface/Widget.h
View File

@ -12,4 +12,4 @@
#include <openrct2/interface/Widget.h>
uint32_t GetColourButtonImage(colour_t colour);
rct_widget* GetWidgetByIndex(const rct_window& w, rct_widgetindex widgetIndex);
rct_widget* GetWidgetByIndex(const rct_window& w, WidgetIndex widgetIndex);

32
src/openrct2-ui/interface/Window.cpp
View File

@ -325,7 +325,7 @@ static int32_t WindowGetScrollIndex(const rct_window& w, int32_t targetWidgetInd
return -1;
int32_t scrollIndex = 0;
rct_widgetindex widgetIndex = 0;
WidgetIndex widgetIndex = 0;
for (rct_widget* widget = w.widgets; widget->type != WindowWidgetType::Last; widget++, widgetIndex++)
{
if (widgetIndex == targetWidgetIndex)
@ -360,7 +360,7 @@ static void WindowScrollWheelInput(rct_window& w, int32_t scrollIndex, int32_t w
{
auto& scroll = w.scrolls[scrollIndex];
rct_widget* widget = WindowGetScrollWidget(w, scrollIndex);
rct_widgetindex widgetIndex = WindowGetWidgetIndex(w, widget);
WidgetIndex widgetIndex = WindowGetWidgetIndex(w, widget);
if (scroll.flags & VSCROLLBAR_VISIBLE)
{
@ -423,7 +423,7 @@ static void WindowViewportWheelInput(rct_window& w, int32_t wheel)
window_zoom_out(w, true);
}
static bool WindowOtherWheelInput(rct_window& w, rct_widgetindex widgetIndex, int32_t wheel)
static bool WindowOtherWheelInput(rct_window& w, WidgetIndex widgetIndex, int32_t 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.
@ -467,7 +467,7 @@ static bool WindowOtherWheelInput(rct_window& w, rct_widgetindex widgetIndex, in
widgetType = w.widgets[widgetIndex].type;
}
rct_widgetindex buttonWidgetIndex;
WidgetIndex buttonWidgetIndex;
WindowWidgetType expectedType;
uint32_t expectedContent[2];
switch (widgetType)
@ -537,7 +537,7 @@ void WindowAllWheelInput()
}
// Check scroll view, cursor is over
rct_widgetindex widgetIndex = window_find_widget_from_point(*w, cursorState->position);
WidgetIndex widgetIndex = window_find_widget_from_point(*w, cursorState->position);
if (widgetIndex != -1)
{
const auto& widget = w->widgets[widgetIndex];
@ -621,7 +621,7 @@ void WindowInitScrollWidgets(rct_window& w)
void WindowDrawWidgets(rct_window& w, rct_drawpixelinfo* dpi)
{
rct_widget* widget;
rct_widgetindex widgetIndex;
WidgetIndex widgetIndex;
if ((w.flags & WF_TRANSPARENT) && !(w.flags & WF_NO_BACKGROUND))
gfx_filter_rect(
@ -665,7 +665,7 @@ void WindowDrawWidgets(rct_window& w, rct_drawpixelinfo* dpi)
*/
static void WindowInvalidatePressedImageButton(const rct_window& w)
{
rct_widgetindex widgetIndex;
WidgetIndex widgetIndex;
rct_widget* widget;
widgetIndex = 0;
@ -702,7 +702,7 @@ void Window::OnDraw(rct_drawpixelinfo& dpi)
WindowDrawWidgets(*this, &dpi);
}
void Window::OnDrawWidget(rct_widgetindex widgetIndex, rct_drawpixelinfo& dpi)
void Window::OnDrawWidget(WidgetIndex widgetIndex, rct_drawpixelinfo& dpi)
{
WidgetDraw(&dpi, *this, widgetIndex);
}
@ -712,32 +712,32 @@ void Window::InitScrollWidgets()
WindowInitScrollWidgets(*this);
}
void Window::InvalidateWidget(rct_widgetindex widgetIndex)
void Window::InvalidateWidget(WidgetIndex widgetIndex)
{
widget_invalidate(*this, widgetIndex);
}
bool Window::IsWidgetDisabled(rct_widgetindex widgetIndex) const
bool Window::IsWidgetDisabled(WidgetIndex widgetIndex) const
{
return WidgetIsDisabled(*this, widgetIndex);
}
bool Window::IsWidgetPressed(rct_widgetindex widgetIndex) const
bool Window::IsWidgetPressed(WidgetIndex widgetIndex) const
{
return WidgetIsPressed(*this, widgetIndex);
}
void Window::SetWidgetDisabled(rct_widgetindex widgetIndex, bool value)
void Window::SetWidgetDisabled(WidgetIndex widgetIndex, bool value)
{
WidgetSetDisabled(*this, widgetIndex, value);
}
void Window::SetWidgetPressed(rct_widgetindex widgetIndex, bool value)
void Window::SetWidgetPressed(WidgetIndex widgetIndex, bool value)
{
WidgetSetPressed(*this, widgetIndex, value);
}
void Window::SetCheckboxValue(rct_widgetindex widgetIndex, bool value)
void Window::SetCheckboxValue(WidgetIndex widgetIndex, bool value)
{
SetWidgetPressed(widgetIndex, value);
}
@ -753,13 +753,13 @@ void Window::Close()
}
void Window::TextInputOpen(
rct_widgetindex callWidget, StringId title, StringId description, const Formatter& descriptionArgs, StringId existingText,
WidgetIndex callWidget, StringId title, StringId description, const Formatter& descriptionArgs, StringId existingText,
uintptr_t existingArgs, int32_t maxLength)
{
WindowTextInputOpen(this, callWidget, title, description, descriptionArgs, existingText, existingArgs, maxLength);
}
void window_align_tabs(rct_window* w, rct_widgetindex start_tab_id, rct_widgetindex end_tab_id)
void window_align_tabs(rct_window* w, WidgetIndex start_tab_id, WidgetIndex end_tab_id)
{
int32_t i, x = w->widgets[start_tab_id].left;
int32_t tab_width = w->widgets[start_tab_id].width();

20
src/openrct2-ui/interface/Window.h
View File

@ -16,22 +16,22 @@ struct Window : rct_window
{
virtual bool IsLegacy() override;
virtual void OnDraw(rct_drawpixelinfo& dpi) override;
virtual void OnDrawWidget(rct_widgetindex widgetIndex, rct_drawpixelinfo& dpi) override;
virtual void OnDrawWidget(WidgetIndex widgetIndex, rct_drawpixelinfo& dpi) override;
void InitScrollWidgets();
void InvalidateWidget(rct_widgetindex widgetIndex);
bool IsWidgetDisabled(rct_widgetindex widgetIndex) const;
bool IsWidgetPressed(rct_widgetindex widgetIndex) const;
void SetWidgetDisabled(rct_widgetindex widgetIndex, bool value);
void SetWidgetPressed(rct_widgetindex widgetIndex, bool value);
void SetCheckboxValue(rct_widgetindex widgetIndex, bool value);
void InvalidateWidget(WidgetIndex widgetIndex);
bool IsWidgetDisabled(WidgetIndex widgetIndex) const;
bool IsWidgetPressed(WidgetIndex widgetIndex) const;
void SetWidgetDisabled(WidgetIndex widgetIndex, bool value);
void SetWidgetPressed(WidgetIndex widgetIndex, bool value);
void SetCheckboxValue(WidgetIndex widgetIndex, bool value);
void DrawWidgets(rct_drawpixelinfo& dpi);
void Close();
void TextInputOpen(
rct_widgetindex callWidget, StringId title, StringId description, const Formatter& descriptionArgs,
StringId existingText, uintptr_t existingArgs, int32_t maxLength);
WidgetIndex callWidget, StringId title, StringId description, const Formatter& descriptionArgs, StringId existingText,
uintptr_t existingArgs, int32_t maxLength);
};
void WindowAllWheelInput();
void ApplyScreenSaverLockSetting();
void window_align_tabs(rct_window* w, rct_widgetindex start_tab_id, rct_widgetindex end_tab_id);
void window_align_tabs(rct_window* w, WidgetIndex start_tab_id, WidgetIndex end_tab_id);

2
src/openrct2-ui/scripting/CustomMenu.cpp
View File

@ -266,7 +266,7 @@ namespace OpenRCT2::Scripting
{
// Use a widget that does not exist on top toolbar but also make sure it isn't -1 as that
// prevents abort from being called.
rct_widgetindex widgetIndex = -2;
WidgetIndex widgetIndex = -2;
tool_cancel();
tool_set(*toolbarWindow, widgetIndex, static_cast<Tool>(customTool.Cursor));
ActiveCustomTool = std::move(customTool);

51
src/openrct2-ui/scripting/CustomWindow.cpp
View File

@ -464,7 +464,7 @@ namespace OpenRCT2::Ui::Windows
// Since the plugin may alter widget positions and sizes during an update event,
// we need to force an update for all list view scrollbars
rct_widgetindex widgetIndex = 0;
WidgetIndex widgetIndex = 0;
for (auto widget = widgets; widget->type != WindowWidgetType::Empty; widget++)
{
if (widget->type == WindowWidgetType::Scroll)
@ -543,7 +543,7 @@ namespace OpenRCT2::Ui::Windows
}
}
void OnDrawWidget(rct_widgetindex widgetIndex, rct_drawpixelinfo& dpi) override
void OnDrawWidget(WidgetIndex widgetIndex, rct_drawpixelinfo& dpi) override
{
const auto& widget = widgets[widgetIndex];
const auto& info = GetInfo(this);
@ -572,7 +572,7 @@ namespace OpenRCT2::Ui::Windows
}
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -582,8 +582,7 @@ namespace OpenRCT2::Ui::Windows
default:
{
const auto& info = GetInfo(this);
if (widgetIndex >= WIDX_TAB_0
&& widgetIndex < static_cast<rct_widgetindex>(WIDX_TAB_0 + info.Desc.Tabs.size()))
if (widgetIndex >= WIDX_TAB_0 && widgetIndex < static_cast<WidgetIndex>(WIDX_TAB_0 + info.Desc.Tabs.size()))
{
ChangeTab(widgetIndex - WIDX_TAB_0);
break;
@ -624,7 +623,7 @@ namespace OpenRCT2::Ui::Windows
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
auto* widget = &widgets[widgetIndex];
const auto& info = GetInfo(this);
@ -671,7 +670,7 @@ namespace OpenRCT2::Ui::Windows
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
if (dropdownIndex == -1)
return;
@ -691,7 +690,7 @@ namespace OpenRCT2::Ui::Windows
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
auto& info = GetInfo(this);
auto widgetDesc = info.GetCustomWidgetDesc(this, widgetIndex);
@ -758,9 +757,9 @@ namespace OpenRCT2::Ui::Windows
}
private:
std::optional<rct_widgetindex> GetViewportWidgetIndex()
std::optional<WidgetIndex> GetViewportWidgetIndex()
{
rct_widgetindex widgetIndex = 0;
WidgetIndex widgetIndex = 0;
for (auto widget = widgets; widget->type != WindowWidgetType::Last; widget++)
{
if (widget->type == WindowWidgetType::Viewport)
@ -843,7 +842,7 @@ namespace OpenRCT2::Ui::Windows
{
for (size_t i = 0; i < numTabs; i++)
{
SetWidgetPressed(static_cast<rct_widgetindex>(WIDX_TAB_0 + i), false);
SetWidgetPressed(static_cast<WidgetIndex>(WIDX_TAB_0 + i), false);
}
SetWidgetPressed(WIDX_TAB_0 + page, true);
}
@ -856,7 +855,7 @@ namespace OpenRCT2::Ui::Windows
size_t tabIndex = 0;
for (const auto& tab : tabs)
{
auto widgetIndex = static_cast<rct_widgetindex>(WIDX_TAB_0 + tabIndex);
auto widgetIndex = static_cast<WidgetIndex>(WIDX_TAB_0 + tabIndex);
auto widget = &widgets[widgetIndex];
if (WidgetIsVisible(*this, widgetIndex))
{
@ -1187,7 +1186,7 @@ namespace OpenRCT2::Ui::Windows
}
}
void UpdateWidgetText(rct_window* w, rct_widgetindex widgetIndex, std::string_view value)
void UpdateWidgetText(rct_window* w, WidgetIndex widgetIndex, std::string_view value)
{
if (w->custom_info != nullptr)
{
@ -1202,7 +1201,7 @@ namespace OpenRCT2::Ui::Windows
}
}
void UpdateWidgetItems(rct_window* w, rct_widgetindex widgetIndex, const std::vector<std::string>& items)
void UpdateWidgetItems(rct_window* w, WidgetIndex widgetIndex, const std::vector<std::string>& items)
{
if (w->custom_info != nullptr)
{
@ -1216,7 +1215,7 @@ namespace OpenRCT2::Ui::Windows
}
}
void UpdateWidgetColour(rct_window* w, rct_widgetindex widgetIndex, colour_t colour)
void UpdateWidgetColour(rct_window* w, WidgetIndex widgetIndex, colour_t colour)
{
if (w->custom_info != nullptr)
{
@ -1243,7 +1242,7 @@ namespace OpenRCT2::Ui::Windows
}
}
void UpdateWidgetSelectedIndex(rct_window* w, rct_widgetindex widgetIndex, int32_t selectedIndex)
void UpdateWidgetSelectedIndex(rct_window* w, WidgetIndex widgetIndex, int32_t selectedIndex)
{
if (w->custom_info != nullptr)
{
@ -1290,7 +1289,7 @@ namespace OpenRCT2::Ui::Windows
}
}
std::vector<std::string> GetWidgetItems(rct_window* w, rct_widgetindex widgetIndex)
std::vector<std::string> GetWidgetItems(rct_window* w, WidgetIndex widgetIndex)
{
if (w->custom_info != nullptr)
{
@ -1304,7 +1303,7 @@ namespace OpenRCT2::Ui::Windows
return {};
}
colour_t GetWidgetColour(rct_window* w, rct_widgetindex widgetIndex)
colour_t GetWidgetColour(rct_window* w, WidgetIndex widgetIndex)
{
if (w->custom_info != nullptr)
{
@ -1318,7 +1317,7 @@ namespace OpenRCT2::Ui::Windows
return COLOUR_BLACK;
}
int32_t GetWidgetSelectedIndex(rct_window* w, rct_widgetindex widgetIndex)
int32_t GetWidgetSelectedIndex(rct_window* w, WidgetIndex widgetIndex)
{
if (w->custom_info != nullptr)
{
@ -1348,7 +1347,7 @@ namespace OpenRCT2::Ui::Windows
return nullptr;
}
std::optional<rct_widgetindex> FindWidgetIndexByName(rct_window* w, std::string_view name)
std::optional<WidgetIndex> FindWidgetIndexByName(rct_window* w, std::string_view name)
{
if (w->custom_info != nullptr)
{
@ -1360,7 +1359,7 @@ namespace OpenRCT2::Ui::Windows
{
if (customWidgetInfo->Name == name)
{
return static_cast<rct_widgetindex>(i);
return static_cast<WidgetIndex>(i);
}
}
}
@ -1368,7 +1367,7 @@ namespace OpenRCT2::Ui::Windows
return std::nullopt;
}
std::string GetWidgetName(rct_window* w, rct_widgetindex widgetIndex)
std::string GetWidgetName(rct_window* w, WidgetIndex widgetIndex)
{
if (w->custom_info != nullptr)
{
@ -1382,7 +1381,7 @@ namespace OpenRCT2::Ui::Windows
return {};
}
void SetWidgetName(rct_window* w, rct_widgetindex widgetIndex, std::string_view name)
void SetWidgetName(rct_window* w, WidgetIndex widgetIndex, std::string_view name)
{
if (w->custom_info != nullptr)
{
@ -1395,7 +1394,7 @@ namespace OpenRCT2::Ui::Windows
}
}
CustomListView* GetCustomListView(rct_window* w, rct_widgetindex widgetIndex)
CustomListView* GetCustomListView(rct_window* w, WidgetIndex widgetIndex)
{
if (w->custom_info != nullptr)
{
@ -1409,7 +1408,7 @@ namespace OpenRCT2::Ui::Windows
return nullptr;
}
int32_t GetWidgetMaxLength(rct_window* w, rct_widgetindex widgetIndex)
int32_t GetWidgetMaxLength(rct_window* w, WidgetIndex widgetIndex)
{
if (w->custom_info != nullptr)
{
@ -1423,7 +1422,7 @@ namespace OpenRCT2::Ui::Windows
return 0;
}
void SetWidgetMaxLength(rct_window* w, rct_widgetindex widgetIndex, int32_t value)
void SetWidgetMaxLength(rct_window* w, WidgetIndex widgetIndex, int32_t value)
{
if (w->custom_info != nullptr)
{

26
src/openrct2-ui/scripting/CustomWindow.h
View File

@ -23,20 +23,20 @@ namespace OpenRCT2::Ui::Windows
std::string GetWindowTitle(rct_window* w);
void UpdateWindowTitle(rct_window* w, std::string_view value);
void UpdateWidgetText(rct_window* w, rct_widgetindex widget, std::string_view string_view);
void UpdateWidgetItems(rct_window* w, rct_widgetindex widgetIndex, const std::vector<std::string>& items);
void UpdateWidgetColour(rct_window* w, rct_widgetindex widgetIndex, colour_t colour);
void UpdateWidgetSelectedIndex(rct_window* w, rct_widgetindex widgetIndex, int32_t selectedIndex);
std::vector<std::string> GetWidgetItems(rct_window* w, rct_widgetindex widgetIndex);
colour_t GetWidgetColour(rct_window* w, rct_widgetindex widgetIndex);
int32_t GetWidgetSelectedIndex(rct_window* w, rct_widgetindex widgetIndex);
void UpdateWidgetText(rct_window* w, WidgetIndex widget, std::string_view string_view);
void UpdateWidgetItems(rct_window* w, WidgetIndex widgetIndex, const std::vector<std::string>& items);
void UpdateWidgetColour(rct_window* w, WidgetIndex widgetIndex, colour_t colour);
void UpdateWidgetSelectedIndex(rct_window* w, WidgetIndex widgetIndex, int32_t selectedIndex);
std::vector<std::string> GetWidgetItems(rct_window* w, WidgetIndex widgetIndex);
colour_t GetWidgetColour(rct_window* w, WidgetIndex widgetIndex);
int32_t GetWidgetSelectedIndex(rct_window* w, WidgetIndex widgetIndex);
rct_window* FindCustomWindowByClassification(std::string_view classification);
std::optional<rct_widgetindex> FindWidgetIndexByName(rct_window* w, std::string_view name);
std::string GetWidgetName(rct_window* w, rct_widgetindex widgetIndex);
void SetWidgetName(rct_window* w, rct_widgetindex widgetIndex, std::string_view name);
CustomListView* GetCustomListView(rct_window* w, rct_widgetindex widgetIndex);
int32_t GetWidgetMaxLength(rct_window* w, rct_widgetindex widgetIndex);
void SetWidgetMaxLength(rct_window* w, rct_widgetindex widgetIndex, int32_t value);
std::optional<WidgetIndex> FindWidgetIndexByName(rct_window* w, std::string_view name);
std::string GetWidgetName(rct_window* w, WidgetIndex widgetIndex);
void SetWidgetName(rct_window* w, WidgetIndex widgetIndex, std::string_view name);
CustomListView* GetCustomListView(rct_window* w, WidgetIndex widgetIndex);
int32_t GetWidgetMaxLength(rct_window* w, WidgetIndex widgetIndex);
void SetWidgetMaxLength(rct_window* w, WidgetIndex widgetIndex, int32_t value);
void CloseWindowsOwnedByPlugin(std::shared_ptr<Plugin> plugin);
} // namespace OpenRCT2::Ui::Windows

28
src/openrct2-ui/scripting/ScWidget.hpp
View File

@ -31,17 +31,17 @@ namespace OpenRCT2::Scripting
protected:
WindowClass _class{};
rct_windownumber _number{};
rct_widgetindex _widgetIndex{};
WidgetIndex _widgetIndex{};
public:
ScWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: _class(c)
, _number(n)
, _widgetIndex(widgetIndex)
{
}
static DukValue ToDukValue(duk_context* ctx, rct_window* w, rct_widgetindex widgetIndex);
static DukValue ToDukValue(duk_context* ctx, rct_window* w, WidgetIndex widgetIndex);
private:
std::shared_ptr<ScWindow> window_get() const;
@ -419,7 +419,7 @@ namespace OpenRCT2::Scripting
class ScButtonWidget : public ScWidget
{
public:
ScButtonWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScButtonWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -497,7 +497,7 @@ namespace OpenRCT2::Scripting
class ScCheckBoxWidget : public ScWidget
{
public:
ScCheckBoxWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScCheckBoxWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -532,7 +532,7 @@ namespace OpenRCT2::Scripting
class ScColourPickerWidget : public ScWidget
{
public:
ScColourPickerWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScColourPickerWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -567,7 +567,7 @@ namespace OpenRCT2::Scripting
class ScDropdownWidget : public ScWidget
{
public:
ScDropdownWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScDropdownWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -622,7 +622,7 @@ namespace OpenRCT2::Scripting
class ScGroupBoxWidget : public ScWidget
{
public:
ScGroupBoxWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScGroupBoxWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -637,7 +637,7 @@ namespace OpenRCT2::Scripting
class ScLabelWidget : public ScWidget
{
public:
ScLabelWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScLabelWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -679,7 +679,7 @@ namespace OpenRCT2::Scripting
class ScListViewWidget : public ScWidget
{
public:
ScListViewWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScListViewWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -870,7 +870,7 @@ namespace OpenRCT2::Scripting
class ScSpinnerWidget : public ScWidget
{
public:
ScSpinnerWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScSpinnerWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -885,7 +885,7 @@ namespace OpenRCT2::Scripting
class ScTextBoxWidget : public ScWidget
{
public:
ScTextBoxWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScTextBoxWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -920,7 +920,7 @@ namespace OpenRCT2::Scripting
class ScViewportWidget : public ScWidget
{
public:
ScViewportWidget(WindowClass c, rct_windownumber n, rct_widgetindex widgetIndex)
ScViewportWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
: ScWidget(c, n, widgetIndex)
{
}
@ -947,7 +947,7 @@ namespace OpenRCT2::Scripting
}
};
inline DukValue ScWidget::ToDukValue(duk_context* ctx, rct_window* w, rct_widgetindex widgetIndex)
inline DukValue ScWidget::ToDukValue(duk_context* ctx, rct_window* w, WidgetIndex widgetIndex)
{
const auto& widget = w->widgets[widgetIndex];
auto c = w->classification;

2
src/openrct2-ui/scripting/ScWindow.hpp
View File

@ -205,7 +205,7 @@ namespace OpenRCT2::Scripting
auto w = GetWindow();
if (w != nullptr)
{
rct_widgetindex widgetIndex = 0;
WidgetIndex widgetIndex = 0;
for (auto widget = w->widgets; widget->type != WindowWidgetType::Last; widget++)
{
result.push_back(ScWidget::ToDukValue(ctx, w, widgetIndex));

2
src/openrct2-ui/windows/About.cpp
View File

@ -98,7 +98,7 @@ public:
SetPage(WINDOW_ABOUT_PAGE_OPENRCT2);
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{

8
src/openrct2-ui/windows/Banner.cpp
View File

@ -142,7 +142,7 @@ public:
CreateViewport();
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
rct_widget* widget = &widgets[widgetIndex];
auto* banner = GetBanner(GetBannerIndex());
@ -176,7 +176,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
auto* banner = GetBanner(GetBannerIndex());
if (banner == nullptr)
@ -215,7 +215,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
switch (widgetIndex)
{
@ -239,7 +239,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (widgetIndex == WIDX_BANNER_TEXT)
{

2
src/openrct2-ui/windows/Changelog.cpp
View File

@ -160,7 +160,7 @@ public:
widgets[WIDX_OPEN_URL].top = height - 19;
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{

24
src/openrct2-ui/windows/Cheats.cpp
View File

@ -370,7 +370,7 @@ public:
InvalidateWidget(WIDX_TAB_1 + page);
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (page)
{
@ -383,7 +383,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -416,7 +416,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t selectedIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t selectedIndex) override
{
if (page == WINDOW_CHEATS_PAGE_MISC)
{
@ -577,7 +577,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (page == WINDOW_CHEATS_PAGE_MONEY && widgetIndex == WIDX_MONEY_SPINNER)
{
@ -590,7 +590,7 @@ public:
}
}
OpenRCT2String OnTooltip(rct_widgetindex widgetIndex, StringId fallback) override
OpenRCT2String OnTooltip(WidgetIndex widgetIndex, StringId fallback) override
{
if (page == WINDOW_CHEATS_PAGE_RIDES && widgetIndex == WIDX_UNLOCK_OPERATING_LIMITS)
{
@ -687,7 +687,7 @@ private:
}
}
void OnMouseDownMoney(rct_widgetindex widgetIndex)
void OnMouseDownMoney(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -759,7 +759,7 @@ private:
}
}
void OnMouseUpMoney(rct_widgetindex widgetIndex)
void OnMouseUpMoney(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -781,7 +781,7 @@ private:
}
}
void OnMouseDownMisc(rct_widgetindex widgetIndex)
void OnMouseDownMisc(WidgetIndex widgetIndex)
{
auto* widget = &widgets[widgetIndex];
switch (widgetIndex)
@ -840,7 +840,7 @@ private:
}
}
void OnMouseUpMisc(rct_widgetindex widgetIndex)
void OnMouseUpMisc(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -899,7 +899,7 @@ private:
}
}
void OnDropdownMisc(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void OnDropdownMisc(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
{
@ -927,7 +927,7 @@ private:
}
}
void OnMouseUpGuests(rct_widgetindex widgetIndex)
void OnMouseUpGuests(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -1009,7 +1009,7 @@ private:
}
}
void OnMouseUpRides(rct_widgetindex widgetIndex)
void OnMouseUpRides(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{

6
src/openrct2-ui/windows/ClearScenery.cpp
View File

@ -84,7 +84,7 @@ public:
tool_cancel();
}
void OnMouseUp(const rct_widgetindex widgetIndex) override
void OnMouseUp(const WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -114,7 +114,7 @@ public:
}
}
void OnMouseDown(const rct_widgetindex widgetIndex) override
void OnMouseDown(const WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -135,7 +135,7 @@ public:
}
}
void OnTextInput(const rct_widgetindex widgetIndex, const std::string_view text) override
void OnTextInput(const WidgetIndex widgetIndex, const std::string_view text) override
{
if (widgetIndex != WIDX_PREVIEW || text.empty())
return;

8
src/openrct2-ui/windows/CustomCurrency.cpp
View File

@ -59,7 +59,7 @@ public:
colours[2] = COLOUR_LIGHT_BROWN;
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
auto* widget = &widgets[widgetIndex - 1];
@ -112,7 +112,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -125,7 +125,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
if (dropdownIndex == -1)
return;
@ -150,7 +150,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (text.empty())
return;

2
src/openrct2-ui/windows/DebugPaint.cpp
View File

@ -63,7 +63,7 @@ public:
ResizeLanguage = LANGUAGE_UNDEFINED;
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{

2
src/openrct2-ui/windows/DemolishRidePrompt.cpp
View File

@ -57,7 +57,7 @@ public:
WindowInitScrollWidgets(*this);
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{

2
src/openrct2-ui/windows/EditorBottomToolbar.cpp
View File

@ -129,7 +129,7 @@ public:
DrawStepText(dpi);
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
if (widgetIndex == WIDX_PREVIOUS_STEP_BUTTON)
{

8
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@ -157,7 +157,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widx) override
void OnMouseUp(WidgetIndex widx) override
{
switch (widx)
{
@ -337,7 +337,7 @@ public:
}
}
CursorID OnCursor(rct_widgetindex widx, const ScreenCoordsXY& screenCoords, CursorID fallback) override
CursorID OnCursor(WidgetIndex widx, const ScreenCoordsXY& screenCoords, CursorID fallback) override
{
bool isInvented = false;
@ -483,7 +483,7 @@ public:
if (windowPos.x <= screenCoords.x && windowPos.y < screenCoords.y && windowPos.x + width > screenCoords.x
&& windowPos.y + height > screenCoords.y)
{
rct_widgetindex widgetIndex = window_find_widget_from_point(*this, screenCoords);
WidgetIndex widgetIndex = window_find_widget_from_point(*this, screenCoords);
auto& widget = widgets[widgetIndex];
if (widgetIndex == WIDX_PRE_RESEARCHED_SCROLL || widgetIndex == WIDX_RESEARCH_ORDER_SCROLL)
{
@ -594,7 +594,7 @@ public:
colours[1] = COLOUR_WHITE;
}
CursorID OnCursor(const rct_widgetindex widx, const ScreenCoordsXY& screenCoords, const CursorID defaultCursor) override
CursorID OnCursor(const WidgetIndex widx, const ScreenCoordsXY& screenCoords, const CursorID defaultCursor) override
{
auto* inventionListWindow = static_cast<InventionListWindow*>(window_find_by_class(WindowClass::EditorInventionList));
if (inventionListWindow != nullptr)

12
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -330,7 +330,7 @@ public:
widget_invalidate(*this, WIDX_FILTER_TEXT_BOX);
}
for (rct_widgetindex i = WIDX_FILTER_RIDE_TAB_TRANSPORT; i <= WIDX_FILTER_RIDE_TAB_STALL; i++)
for (WidgetIndex i = WIDX_FILTER_RIDE_TAB_TRANSPORT; i <= WIDX_FILTER_RIDE_TAB_STALL; i++)
{
if (!IsWidgetPressed(i))
continue;
@ -348,7 +348,7 @@ public:
*
* rct2: 0x006AAFAB
*/
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -464,7 +464,7 @@ public:
window_set_resize(*this, WW, WH, 1200, 1000);
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
int32_t numSelectionItems = 0;
@ -524,7 +524,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
if (dropdownIndex == -1)
return;
@ -780,7 +780,7 @@ public:
*
* rct2: 0x006AB058
*/
OpenRCT2String OnTooltip(const rct_widgetindex widgetIndex, const StringId fallback) override
OpenRCT2String OnTooltip(const WidgetIndex widgetIndex, const StringId fallback) override
{
if (widgetIndex >= WIDX_TAB_1 && static_cast<size_t>(widgetIndex) < WIDX_TAB_1 + std::size(ObjectSelectionPages))
{
@ -791,7 +791,7 @@ public:
return { fallback, {} };
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (widgetIndex != WIDX_FILTER_TEXT_BOX || text.empty())
return;

20
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -121,16 +121,16 @@ static rct_widget *window_editor_objective_options_widgets[] = {
#pragma region Events
static void WindowEditorObjectiveOptionsMainMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorObjectiveOptionsMainMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowEditorObjectiveOptionsMainResize(rct_window *w);
static void WindowEditorObjectiveOptionsMainMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowEditorObjectiveOptionsMainDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowEditorObjectiveOptionsMainMousedown(rct_window *w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowEditorObjectiveOptionsMainDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowEditorObjectiveOptionsMainUpdate(rct_window *w);
static void WindowEditorObjectiveOptionsMainTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowEditorObjectiveOptionsMainTextinput(rct_window *w, WidgetIndex widgetIndex, char *text);
static void WindowEditorObjectiveOptionsMainInvalidate(rct_window *w);
static void WindowEditorObjectiveOptionsMainPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorObjectiveOptionsRidesMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorObjectiveOptionsRidesMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowEditorObjectiveOptionsRidesResize(rct_window *w);
static void WindowEditorObjectiveOptionsRidesUpdate(rct_window *w);
static void WindowEditorObjectiveOptionsRidesScrollgetheight(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
@ -335,7 +335,7 @@ static void WindowEditorObjectiveOptionsSetObjective(rct_window* w, int32_t obje
*
* rct2: 0x006719CA
*/
static void WindowEditorObjectiveOptionsMainMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorObjectiveOptionsMainMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -591,7 +591,7 @@ static void WindowEditorObjectiveOptionsArg2Decrease(rct_window* w)
*
* rct2: 0x00671A0D
*/
static void WindowEditorObjectiveOptionsMainMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowEditorObjectiveOptionsMainMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -620,7 +620,7 @@ static void WindowEditorObjectiveOptionsMainMousedown(rct_window* w, rct_widgeti
*
* rct2: 0x00671A54
*/
static void WindowEditorObjectiveOptionsMainDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowEditorObjectiveOptionsMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
uint8_t newObjectiveType;
@ -677,7 +677,7 @@ static void WindowEditorObjectiveOptionsMainUpdate(rct_window* w)
*
* rct2: 0x00671A73
*/
static void WindowEditorObjectiveOptionsMainTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowEditorObjectiveOptionsMainTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if (text == nullptr)
return;
@ -913,7 +913,7 @@ static void WindowEditorObjectiveOptionsMainPaint(rct_window* w, rct_drawpixelin
*
* rct2: 0x006724A4
*/
static void WindowEditorObjectiveOptionsRidesMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorObjectiveOptionsRidesMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{

28
src/openrct2-ui/windows/EditorScenarioOptions.cpp
View File

@ -179,24 +179,24 @@ static rct_widget *window_editor_scenario_options_widgets[] = {
#pragma region Events
static void WindowEditorScenarioOptionsFinancialMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorScenarioOptionsFinancialMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowEditorScenarioOptionsFinancialResize(rct_window *w);
static void WindowEditorScenarioOptionsFinancialMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowEditorScenarioOptionsFinancialMousedown(rct_window *w, WidgetIndex widgetIndex, rct_widget *widget);
static void WindowEditorScenarioOptionsFinancialUpdate(rct_window *w);
static void WindowEditorScenarioOptionsFinancialInvalidate(rct_window *w);
static void WindowEditorScenarioOptionsFinancialPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorScenarioOptionsGuestsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorScenarioOptionsGuestsMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowEditorScenarioOptionsGuestsResize(rct_window *w);
static void WindowEditorScenarioOptionsGuestsMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowEditorScenarioOptionsGuestsMousedown(rct_window *w, WidgetIndex widgetIndex, rct_widget *widget);
static void WindowEditorScenarioOptionsGuestsUpdate(rct_window *w);
static void WindowEditorScenarioOptionsGuestsInvalidate(rct_window *w);
static void WindowEditorScenarioOptionsGuestsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowEditorScenarioOptionsParkMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowEditorScenarioOptionsParkMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowEditorScenarioOptionsParkResize(rct_window *w);
static void WindowEditorScenarioOptionsParkMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowEditorScenarioOptionsParkDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowEditorScenarioOptionsParkMousedown(rct_window *w, WidgetIndex widgetIndex, rct_widget *widget);
static void WindowEditorScenarioOptionsParkDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowEditorScenarioOptionsParkUpdate(rct_window *w);
static void WindowEditorScenarioOptionsParkInvalidate(rct_window *w);
static void WindowEditorScenarioOptionsParkPaint(rct_window *w, rct_drawpixelinfo *dpi);
@ -373,7 +373,7 @@ static void WindowEditorScenarioOptionsSetPage(rct_window* w, int32_t page)
*
* rct2: 0x0067049D
*/
static void WindowEditorScenarioOptionsFinancialMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorScenarioOptionsFinancialMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -434,7 +434,7 @@ static void WindowEditorScenarioOptionsShowClimateDropdown(rct_window* w)
*
* rct2: 0x006704C8
*/
static void WindowEditorScenarioOptionsFinancialMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowEditorScenarioOptionsFinancialMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -677,7 +677,7 @@ static void WindowEditorScenarioOptionsFinancialPaint(rct_window* w, rct_drawpix
*
* rct2: 0x00670A62
*/
static void WindowEditorScenarioOptionsGuestsMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorScenarioOptionsGuestsMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -721,7 +721,7 @@ static void WindowEditorScenarioOptionsGuestsResize(rct_window* w)
*
* rct2: 0x00670A89
*/
static void WindowEditorScenarioOptionsGuestsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowEditorScenarioOptionsGuestsMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -958,7 +958,7 @@ static void WindowEditorScenarioOptionsGuestsPaint(rct_window* w, rct_drawpixeli
*
* rct2: 0x00670FD8
*/
static void WindowEditorScenarioOptionsParkMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowEditorScenarioOptionsParkMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -1027,7 +1027,7 @@ static void WindowEditorScenarioOptionsParkResize(rct_window* w)
*
* rct2: 0x00671019
*/
static void WindowEditorScenarioOptionsParkMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowEditorScenarioOptionsParkMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
rct_widget* dropdownWidget;
@ -1141,7 +1141,7 @@ static void WindowEditorScenarioOptionsParkMousedown(rct_window* w, rct_widgetin
*
* rct2: 0x00671060
*/
static void WindowEditorScenarioOptionsParkDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowEditorScenarioOptionsParkDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
{

20
src/openrct2-ui/windows/Finances.cpp
View File

@ -240,7 +240,7 @@ public:
InvalidateWidget(WIDX_TAB_1 + page);
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (page)
{
@ -253,7 +253,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -281,7 +281,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t selectedIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t selectedIndex) override
{
if (page == WINDOW_FINANCES_PAGE_RESEARCH)
{
@ -473,7 +473,7 @@ public:
#pragma region Summary Events
void OnMouseDownSummary(rct_widgetindex widgetIndex)
void OnMouseDownSummary(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -762,7 +762,7 @@ public:
#pragma region Marketing Events
void OnMouseUpMarketing(rct_widgetindex widgetIndex)
void OnMouseUpMarketing(WidgetIndex widgetIndex)
{
if (widgetIndex >= WIDX_CAMPAIGN_1 && widgetIndex <= WIDX_CAMPAIGN_6)
{
@ -883,7 +883,7 @@ public:
#pragma region Research Events
void OnMouseUpResearch(rct_widgetindex widgetIndex)
void OnMouseUpResearch(WidgetIndex widgetIndex)
{
if (widgetIndex >= WIDX_TRANSPORT_RIDES && widgetIndex <= WIDX_SCENERY_AND_THEMING)
{
@ -895,7 +895,7 @@ public:
}
}
void OnMouseDownResearch(rct_widgetindex widgetIndex)
void OnMouseDownResearch(WidgetIndex widgetIndex)
{
if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON)
return;
@ -916,7 +916,7 @@ public:
Dropdown::SetChecked(currentResearchLevel, true);
}
void OnDropdownResearch(rct_widgetindex widgetIndex, int32_t selectedIndex)
void OnDropdownResearch(WidgetIndex widgetIndex, int32_t selectedIndex)
{
if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON || selectedIndex == -1)
return;
@ -976,7 +976,7 @@ public:
#pragma endregion
void InitialiseScrollPosition(rct_widgetindex widgetIndex, int32_t scrollId)
void InitialiseScrollPosition(WidgetIndex widgetIndex, int32_t scrollId)
{
const auto& widget = this->widgets[widgetIndex];
scrolls[scrollId].h_left = std::max(0, scrolls[scrollId].h_right - (widget.width() - 2));
@ -986,7 +986,7 @@ public:
void DrawTabImage(rct_drawpixelinfo& dpi, int32_t tabPage, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + tabPage;
WidgetIndex widgetIndex = WIDX_TAB_1 + tabPage;
if (!IsWidgetDisabled(widgetIndex))
{

31
src/openrct2-ui/windows/Footpath.cpp
View File

@ -114,14 +114,14 @@ static rct_widget window_footpath_widgets[] = {
};
static void WindowFootpathClose(rct_window * w);
static void WindowFootpathMouseup(rct_window * w, rct_widgetindex widgetIndex);
static void WindowFootpathMousedown(rct_window * w, rct_widgetindex widgetIndex, rct_widget * widget);
static void WindowFootpathDropdown(rct_window * w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowFootpathMouseup(rct_window * w, WidgetIndex widgetIndex);
static void WindowFootpathMousedown(rct_window * w, WidgetIndex widgetIndex, rct_widget * widget);
static void WindowFootpathDropdown(rct_window * w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowFootpathUpdate(rct_window * w);
static void WindowFootpathToolupdate(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathTooldown(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathTooldrag(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathToolup(rct_window * w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathToolupdate(rct_window * w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathTooldown(rct_window * w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathTooldrag(rct_window * w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathToolup(rct_window * w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowFootpathInvalidate(rct_window * w);
static void WindowFootpathPaint(rct_window * w, rct_drawpixelinfo * dpi);
@ -240,7 +240,7 @@ static void WindowFootpathClose(rct_window* w)
*
* rct2: 0x006A7E92
*/
static void WindowFootpathMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowFootpathMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -294,7 +294,7 @@ static void WindowFootpathMouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x006A7EC5
*/
static void WindowFootpathMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowFootpathMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -335,7 +335,7 @@ static void WindowFootpathMousedown(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006A7F18
*/
static void WindowFootpathDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowFootpathDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex < 0 || static_cast<size_t>(dropdownIndex) >= _dropdownEntries.size())
return;
@ -385,7 +385,7 @@ static void WindowFootpathDropdown(rct_window* w, rct_widgetindex widgetIndex, i
*
* rct2: 0x006A8032
*/
static void WindowFootpathToolupdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowFootpathToolupdate(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND)
{
@ -401,7 +401,7 @@ static void WindowFootpathToolupdate(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006A8047
*/
static void WindowFootpathTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowFootpathTooldown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND)
{
@ -417,7 +417,7 @@ static void WindowFootpathTooldown(rct_window* w, rct_widgetindex widgetIndex, c
*
* rct2: 0x006A8067
*/
static void WindowFootpathTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowFootpathTooldrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND)
{
@ -429,7 +429,7 @@ static void WindowFootpathTooldrag(rct_window* w, rct_widgetindex widgetIndex, c
*
* rct2: 0x006A8066
*/
static void WindowFootpathToolup(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowFootpathToolup(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_CONSTRUCT_ON_LAND)
{
@ -571,8 +571,7 @@ static void WindowFootpathInvalidate(rct_window* w)
}
}
static void WindowFootpathDrawDropdownButton(
rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex widgetIndex, ImageIndex image)
static void WindowFootpathDrawDropdownButton(rct_window* w, rct_drawpixelinfo* dpi, WidgetIndex widgetIndex, ImageIndex image)
{
const auto& widget = w->widgets[widgetIndex];
gfx_draw_sprite(dpi, ImageId(image), { w->windowPos.x + widget.left, w->windowPos.y + widget.top });

12
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@ -69,12 +69,12 @@ static rct_widget window_game_bottom_toolbar_widgets[] =
uint8_t gToolbarDirtyFlags;
static void WindowGameBottomToolbarMouseup(rct_window *w, rct_widgetindex widgetIndex);
static OpenRCT2String WindowGameBottomToolbarTooltip(rct_window* w, const rct_widgetindex widgetIndex, const StringId fallback);
static void WindowGameBottomToolbarMouseup(rct_window *w, WidgetIndex widgetIndex);
static OpenRCT2String WindowGameBottomToolbarTooltip(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback);
static void WindowGameBottomToolbarInvalidate(rct_window *w);
static void WindowGameBottomToolbarPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowGameBottomToolbarUpdate(rct_window* w);
static void WindowGameBottomToolbarCursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void WindowGameBottomToolbarCursor(rct_window *w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void WindowGameBottomToolbarUnknown05(rct_window *w);
static void WindowGameBottomToolbarDrawLeftPanel(rct_drawpixelinfo *dpi, rct_window *w);
@ -133,7 +133,7 @@ rct_window* WindowGameBottomToolbarOpen()
*
* rct2: 0x0066C588
*/
static void WindowGameBottomToolbarMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowGameBottomToolbarMouseup(rct_window* w, WidgetIndex widgetIndex)
{
News::Item* newsItem;
@ -188,7 +188,7 @@ static void WindowGameBottomToolbarMouseup(rct_window* w, rct_widgetindex widget
}
}
static OpenRCT2String WindowGameBottomToolbarTooltip(rct_window* w, const rct_widgetindex widgetIndex, const StringId fallback)
static OpenRCT2String WindowGameBottomToolbarTooltip(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback)
{
int32_t month, day;
auto ft = Formatter();
@ -702,7 +702,7 @@ static void WindowGameBottomToolbarUpdate(rct_window* w)
* rct2: 0x0066C644
*/
static void WindowGameBottomToolbarCursor(
rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
{
switch (widgetIndex)
{

28
src/openrct2-ui/windows/Guest.cpp
View File

@ -200,7 +200,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widx) override
void OnMouseUp(WidgetIndex widx) override
{
switch (widx)
{
@ -225,14 +225,14 @@ public:
break;
}
}
void OnMouseDown(rct_widgetindex widx) override
void OnMouseDown(WidgetIndex widx) override
{
if (page == WINDOW_GUEST_OVERVIEW)
{
OnMouseDownOverview(widx);
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t selectedIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t selectedIndex) override
{
if (page == WINDOW_GUEST_OVERVIEW)
{
@ -283,28 +283,28 @@ public:
break;
}
}
void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
if (page == WINDOW_GUEST_OVERVIEW)
{
OnToolUpdateOverview(widgetIndex, screenCoords);
}
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
if (page == WINDOW_GUEST_OVERVIEW)
{
OnToolDownOverview(widgetIndex, screenCoords);
}
}
void OnToolAbort(rct_widgetindex widgetIndex) override
void OnToolAbort(WidgetIndex widgetIndex) override
{
if (page == WINDOW_GUEST_OVERVIEW)
{
OnToolAbortOverview(widgetIndex);
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (page == WINDOW_GUEST_OVERVIEW)
{
@ -606,7 +606,7 @@ private:
OnViewportRotate();
}
void OnMouseUpOverview(rct_widgetindex widgetIndex)
void OnMouseUpOverview(WidgetIndex widgetIndex)
{
const auto peep = GetGuest();
if (peep == nullptr)
@ -657,7 +657,7 @@ private:
}
}
void OnMouseDownOverview(rct_widgetindex widgetIndex)
void OnMouseDownOverview(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -667,7 +667,7 @@ private:
}
}
void OnDropdownOverview(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void OnDropdownOverview(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -896,7 +896,7 @@ private:
}
}
void OnTextInputOverview(rct_widgetindex widgetIndex, std::string_view text)
void OnTextInputOverview(WidgetIndex widgetIndex, std::string_view text)
{
if (widgetIndex != WIDX_RENAME)
return;
@ -908,7 +908,7 @@ private:
GameActions::Execute(&gameAction);
}
void OnToolUpdateOverview(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void OnToolUpdateOverview(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -952,7 +952,7 @@ private:
gPickupPeepImage = ImageId(baseImageId, peep->TshirtColour, peep->TrousersColour);
}
void OnToolDownOverview(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void OnToolDownOverview(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -976,7 +976,7 @@ private:
GameActions::Execute(&pickupAction);
}
void OnToolAbortOverview(rct_widgetindex widgetIndex)
void OnToolAbortOverview(WidgetIndex widgetIndex)
{
if (widgetIndex != WIDX_PICKUP)
return;

8
src/openrct2-ui/windows/GuestList.cpp
View File

@ -274,7 +274,7 @@ public:
gWindowMapFlashingFlags |= MapFlashingFlags::GuestListOpen;
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -309,7 +309,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -378,7 +378,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
switch (widgetIndex)
{
@ -393,7 +393,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (!text.empty())
{

8
src/openrct2-ui/windows/InstallTrack.cpp
View File

@ -58,10 +58,10 @@ static rct_widget window_install_track_widgets[] = {
};
static void WindowInstallTrackClose(rct_window *w);
static void WindowInstallTrackMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowInstallTrackMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowInstallTrackInvalidate(rct_window *w);
static void WindowInstallTrackPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowInstallTrackTextInput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowInstallTrackTextInput(rct_window *w, WidgetIndex widgetIndex, char *text);
static rct_window_event_list window_install_track_events([](auto& events)
{
@ -150,7 +150,7 @@ static void WindowInstallTrackClose(rct_window* w)
*
* rct2: 0x006D407A
*/
static void WindowInstallTrackMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowInstallTrackMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -412,7 +412,7 @@ static void WindowInstallTrackPaint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006D40A7
*/
static void WindowInstallTrackTextInput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowInstallTrackTextInput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if (widgetIndex != WIDX_INSTALL || str_is_null_or_empty(text))
{

10
src/openrct2-ui/windows/Land.cpp
View File

@ -92,7 +92,7 @@ public:
tool_cancel();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -115,7 +115,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
rct_widget* widget = &widgets[widgetIndex];
switch (widgetIndex)
@ -146,7 +146,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
int32_t type;
@ -189,7 +189,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (widgetIndex != WIDX_PREVIEW)
return;
@ -331,7 +331,7 @@ private:
DrawDropdownButton(dpi, WIDX_WALL, edgeImage);
}
void DrawDropdownButton(rct_drawpixelinfo& dpi, rct_widgetindex widgetIndex, ImageId image)
void DrawDropdownButton(rct_drawpixelinfo& dpi, WidgetIndex widgetIndex, ImageId image)
{
const auto& widget = widgets[widgetIndex];
gfx_draw_sprite(&dpi, image, { windowPos.x + widget.left, windowPos.y + widget.top });

14
src/openrct2-ui/windows/LandRights.cpp
View File

@ -90,7 +90,7 @@ public:
tool_cancel();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -121,7 +121,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -142,7 +142,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (text.empty())
return;
@ -234,7 +234,7 @@ public:
}
}
void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
map_invalidate_selection_rect();
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
@ -316,7 +316,7 @@ public:
_landRightsCost = res.Error == GameActions::Status::Ok ? res.Cost : MONEY32_UNDEFINED;
}
void OnToolAbort(rct_widgetindex widgetIndex) override
void OnToolAbort(WidgetIndex widgetIndex) override
{
hide_gridlines();
if (_landRightsMode == LAND_RIGHTS_MODE_BUY_LAND)
@ -329,7 +329,7 @@ public:
}
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
if (_landRightsMode == LAND_RIGHTS_MODE_BUY_LAND)
{
@ -353,7 +353,7 @@ public:
}
}
void OnToolDrag(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDrag(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
if (_landRightsMode == LAND_RIGHTS_MODE_BUY_LAND)
{

12
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -82,12 +82,12 @@ static rct_widget window_loadsave_widgets[] =
#pragma region Events
static void WindowLoadsaveClose(rct_window *w);
static void WindowLoadsaveMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowLoadsaveMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowLoadsaveResize(rct_window *w);
static void WindowLoadsaveScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowLoadsaveScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowLoadsaveScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowLoadsaveTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowLoadsaveTextinput(rct_window *w, WidgetIndex widgetIndex, char *text);
static void WindowLoadsaveComputeMaxDateWidth();
static void WindowLoadsaveInvalidate(rct_window *w);
static void WindowLoadsavePaint(rct_window *w, rct_drawpixelinfo *dpi);
@ -436,7 +436,7 @@ static u8string Browse(bool isSave)
return outPath;
}
static void WindowLoadsaveMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowLoadsaveMouseup(rct_window* w, WidgetIndex widgetIndex)
{
bool isSave = (_type & 0x01) == LOADSAVETYPE_SAVE;
switch (widgetIndex)
@ -568,7 +568,7 @@ static void WindowLoadsaveScrollmouseover(rct_window* w, int32_t scrollIndex, co
w->Invalidate();
}
static void WindowLoadsaveTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowLoadsaveTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
bool overwrite;
@ -1137,7 +1137,7 @@ static rct_widget window_overwrite_prompt_widgets[] = {
WIDGETS_END,
};
static void WindowOverwritePromptMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowOverwritePromptMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowOverwritePromptPaint(rct_window* w, rct_drawpixelinfo* dpi);
static rct_window_event_list window_overwrite_prompt_events([](auto& events) {
@ -1169,7 +1169,7 @@ static rct_window* WindowOverwritePromptOpen(const char* name, const char* path)
return w;
}
static void WindowOverwritePromptMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowOverwritePromptMouseup(rct_window* w, WidgetIndex widgetIndex)
{
rct_window* loadsaveWindow;

16
src/openrct2-ui/windows/Map.cpp
View File

@ -185,7 +185,7 @@ public:
max_height = 560;
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -284,7 +284,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -352,7 +352,7 @@ public:
}
}
void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
switch (widgetIndex)
{
@ -368,7 +368,7 @@ public:
}
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
switch (widgetIndex)
{
@ -381,7 +381,7 @@ public:
}
}
void OnToolDrag(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDrag(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
switch (widgetIndex)
{
@ -397,7 +397,7 @@ public:
}
}
void OnToolAbort(rct_widgetindex widgetIndex) override
void OnToolAbort(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -590,7 +590,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (text.empty())
return;
@ -1330,7 +1330,7 @@ private:
TextInputOpen(WIDX_LAND_TOOL, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, 3);
}
void InputMapSize(rct_widgetindex callingWidget)
void InputMapSize(WidgetIndex callingWidget)
{
if (IsWidgetPressed(WIDX_MAP_SIZE_LINK))
_resizeDirection = ResizeDirection::Both;

56
src/openrct2-ui/windows/MapGen.cpp
View File

@ -198,31 +198,31 @@ static rct_widget* PageWidgets[WINDOW_MAPGEN_PAGE_COUNT] = {
#pragma region Events
static void WindowMapgenSharedClose(rct_window* w);
static void WindowMapgenSharedMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenSharedMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowMapgenBaseMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenBaseMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenBaseDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowMapgenBaseMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowMapgenBaseMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowMapgenBaseDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowMapgenBaseUpdate(rct_window* w);
static void WindowMapgenTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowMapgenTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
static void WindowMapgenBaseInvalidate(rct_window* w);
static void WindowMapgenBasePaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenRandomMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenRandomMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenRandomMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowMapgenRandomMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowMapgenRandomUpdate(rct_window* w);
static void WindowMapgenRandomInvalidate(rct_window* w);
static void WindowMapgenRandomPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenSimplexMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenSimplexMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenSimplexDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowMapgenSimplexMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowMapgenSimplexMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowMapgenSimplexDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowMapgenSimplexUpdate(rct_window* w);
static void WindowMapgenSimplexInvalidate(rct_window* w);
static void WindowMapgenSimplexPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowMapgenHeightmapMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowMapgenHeightmapMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMapgenHeightmapMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowMapgenHeightmapMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowMapgenHeightmapInvalidate(rct_window* w);
static void WindowMapgenHeightmapPaint(rct_window* w, rct_drawpixelinfo* dpi);
@ -450,7 +450,7 @@ static void WindowMapgenSharedClose(rct_window* w)
mapgen_unload_heightmap();
}
static void WindowMapgenSharedMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenSharedMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -466,7 +466,7 @@ static void WindowMapgenSharedMouseup(rct_window* w, rct_widgetindex widgetIndex
}
}
static void WindowMapgenInputMapSize(rct_window* w, rct_widgetindex callingWidget, int32_t currentValue)
static void WindowMapgenInputMapSize(rct_window* w, WidgetIndex callingWidget, int32_t currentValue)
{
Formatter ft;
ft.Add<int16_t>(MINIMUM_MAP_SIZE_PRACTICAL);
@ -479,7 +479,7 @@ static void WindowMapgenInputMapSize(rct_window* w, rct_widgetindex callingWidge
#pragma region Base page
static void WindowMapgenBaseMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenBaseMouseup(rct_window* w, WidgetIndex widgetIndex)
{
WindowMapgenSharedMouseup(w, widgetIndex);
@ -523,7 +523,7 @@ static void WindowMapgenBaseMouseup(rct_window* w, rct_widgetindex widgetIndex)
}
}
static void WindowMapgenBaseMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenBaseMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -572,7 +572,7 @@ static void WindowMapgenBaseMousedown(rct_window* w, rct_widgetindex widgetIndex
}
}
static void WindowMapgenBaseDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowMapgenBaseDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
int32_t type;
@ -623,7 +623,7 @@ static void WindowMapgenBaseUpdate(rct_window* w)
widget_invalidate(*w, WIDX_TAB_1);
}
static void WindowMapgenTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowMapgenTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
int32_t value;
char* end;
@ -682,7 +682,7 @@ static void WindowMapgenBaseInvalidate(rct_window* w)
ft.Add<uint16_t>(_mapSize.x - 2);
}
static void WindowMapgenDrawDropdownButton(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex widgetIndex, ImageId image)
static void WindowMapgenDrawDropdownButton(rct_window* w, rct_drawpixelinfo* dpi, WidgetIndex widgetIndex, ImageId image)
{
const auto& widget = w->widgets[widgetIndex];
ScreenCoordsXY pos = { w->windowPos.x + widget.left, w->windowPos.y + widget.top };
@ -705,7 +705,7 @@ static void WindowMapgenDrawDropdownButton(rct_window* w, rct_drawpixelinfo* dpi
}
static void WindowMapgenDrawDropdownButtons(
rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex floorWidgetIndex, rct_widgetindex edgeWidgetIndex)
rct_window* w, rct_drawpixelinfo* dpi, WidgetIndex floorWidgetIndex, WidgetIndex edgeWidgetIndex)
{
auto& objManager = GetContext()->GetObjectManager();
const auto surfaceObj = static_cast<TerrainSurfaceObject*>(
@ -767,7 +767,7 @@ static void WindowMapgenBasePaint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma region Random page
static void WindowMapgenRandomMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenRandomMouseup(rct_window* w, WidgetIndex widgetIndex)
{
WindowMapgenSharedMouseup(w, widgetIndex);
@ -800,7 +800,7 @@ static void WindowMapgenRandomMouseup(rct_window* w, rct_widgetindex widgetIndex
}
}
static void WindowMapgenRandomMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenRandomMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
}
@ -839,7 +839,7 @@ static void WindowMapgenRandomPaint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma region Simplex page
static void WindowMapgenSimplexMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenSimplexMouseup(rct_window* w, WidgetIndex widgetIndex)
{
WindowMapgenSharedMouseup(w, widgetIndex);
@ -878,7 +878,7 @@ static void WindowMapgenSimplexMouseup(rct_window* w, rct_widgetindex widgetInde
}
}
static void WindowMapgenSimplexMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenSimplexMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -959,7 +959,7 @@ static void WindowMapgenSimplexMousedown(rct_window* w, rct_widgetindex widgetIn
}
}
static void WindowMapgenSimplexDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowMapgenSimplexDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
int32_t type;
@ -1114,7 +1114,7 @@ static void WindowMapgenSimplexPaint(rct_window* w, rct_drawpixelinfo* dpi)
#pragma region Heightmap page
static void WindowMapgenHeightmapMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMapgenHeightmapMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -1188,7 +1188,7 @@ static void WindowMapgenHeightmapLoadsaveCallback(int32_t result, const utf8* pa
}
}
static void WindowMapgenHeightmapMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMapgenHeightmapMouseup(rct_window* w, WidgetIndex widgetIndex)
{
WindowMapgenSharedMouseup(w, widgetIndex);
@ -1359,7 +1359,7 @@ static void WindowMapgenSetPressedTab(rct_window* w)
static void WindowMapgenDrawTabImage(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
WidgetIndex widgetIndex = WIDX_TAB_1 + page;
if (!WidgetIsDisabled(*w, widgetIndex))
{

12
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@ -135,7 +135,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -176,7 +176,7 @@ public:
if (currentDisabledWidgets == disabledWidgets)
return;
for (rct_widgetindex i = 0; i < 64; i++)
for (WidgetIndex i = 0; i < 64; i++)
{
if ((disabledWidgets & (1ULL << i)) != (currentDisabledWidgets & (1ULL << i)))
{
@ -186,7 +186,7 @@ public:
disabled_widgets = disabledWidgets;
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -248,7 +248,7 @@ public:
UpdateGhostTrackAndArrow();
}
void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
switch (widgetIndex)
{
@ -262,7 +262,7 @@ public:
}
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
switch (widgetIndex)
{
@ -298,7 +298,7 @@ public:
}
private:
void WindowMazeConstructionEntranceMouseup(rct_widgetindex widgetIndex)
void WindowMazeConstructionEntranceMouseup(WidgetIndex widgetIndex)
{
if (tool_set(*this, widgetIndex, Tool::Crosshair))
return;

30
src/openrct2-ui/windows/Multiplayer.cpp
View File

@ -120,13 +120,13 @@ static constexpr StringId WindowMultiplayerPageTitles[] = {
static uint8_t _selectedGroup = 0;
static void WindowMultiplayerInformationMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowMultiplayerInformationMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowMultiplayerInformationResize(rct_window *w);
static void WindowMultiplayerInformationUpdate(rct_window *w);
static void WindowMultiplayerInformationInvalidate(rct_window *w);
static void WindowMultiplayerInformationPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowMultiplayerPlayersMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowMultiplayerPlayersMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowMultiplayerPlayersResize(rct_window *w);
static void WindowMultiplayerPlayersUpdate(rct_window *w);
static void WindowMultiplayerPlayersScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
@ -136,20 +136,20 @@ static void WindowMultiplayerPlayersInvalidate(rct_window *w);
static void WindowMultiplayerPlayersPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowMultiplayerPlayersScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowMultiplayerGroupsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowMultiplayerGroupsMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowMultiplayerGroupsResize(rct_window *w);
static void WindowMultiplayerGroupsMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowMultiplayerGroupsDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowMultiplayerGroupsMousedown(rct_window *w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowMultiplayerGroupsDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowMultiplayerGroupsUpdate(rct_window *w);
static void WindowMultiplayerGroupsScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowMultiplayerGroupsScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowMultiplayerGroupsScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowMultiplayerGroupsTextInput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowMultiplayerGroupsTextInput(rct_window *w, WidgetIndex widgetIndex, char *text);
static void WindowMultiplayerGroupsInvalidate(rct_window *w);
static void WindowMultiplayerGroupsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowMultiplayerGroupsScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
static void WindowMultiplayerOptionsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowMultiplayerOptionsMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowMultiplayerOptionsResize(rct_window *w);
static void WindowMultiplayerOptionsUpdate(rct_window *w);
static void WindowMultiplayerOptionsInvalidate(rct_window *w);
@ -314,7 +314,7 @@ static void WindowMultiplayerGroupsShowGroupDropdown(rct_window* w, rct_widget*
#pragma region Information page
static void WindowMultiplayerInformationMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMultiplayerInformationMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -464,7 +464,7 @@ static void WindowMultiplayerInformationPaint(rct_window* w, rct_drawpixelinfo*
#pragma region Players page
static void WindowMultiplayerPlayersMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMultiplayerPlayersMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -672,7 +672,7 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, rct_drawpixelinfo
#pragma region Groups page
static void WindowMultiplayerGroupsMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMultiplayerGroupsMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -719,7 +719,7 @@ static void WindowMultiplayerGroupsResize(rct_window* w)
w->Invalidate();
}
static void WindowMultiplayerGroupsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowMultiplayerGroupsMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -732,7 +732,7 @@ static void WindowMultiplayerGroupsMousedown(rct_window* w, rct_widgetindex widg
}
}
static void WindowMultiplayerGroupsDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowMultiplayerGroupsDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
{
@ -811,7 +811,7 @@ static void WindowMultiplayerGroupsScrollmouseover(rct_window* w, int32_t scroll
w->Invalidate();
}
static void WindowMultiplayerGroupsTextInput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowMultiplayerGroupsTextInput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if (widgetIndex != WIDX_RENAME_GROUP)
return;
@ -930,7 +930,7 @@ static void WindowMultiplayerGroupsScrollpaint(rct_window* w, rct_drawpixelinfo*
#pragma region Options page
static void WindowMultiplayerOptionsMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowMultiplayerOptionsMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -998,7 +998,7 @@ static void WindowMultiplayerOptionsPaint(rct_window* w, rct_drawpixelinfo* dpi)
static void WindowMultiplayerDrawTabImage(rct_window* w, rct_drawpixelinfo* dpi, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB1 + page;
WidgetIndex widgetIndex = WIDX_TAB1 + page;
if (!WidgetIsDisabled(*w, widgetIndex))
{

8
src/openrct2-ui/windows/NetworkStatus.cpp
View File

@ -34,9 +34,9 @@ static rct_widget window_network_status_widgets[] = {
static char window_network_status_text[1024];
static void WindowNetworkStatusOnclose(rct_window *w);
static void WindowNetworkStatusMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowNetworkStatusMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowNetworkStatusUpdate(rct_window *w);
static void WindowNetworkStatusTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowNetworkStatusTextinput(rct_window *w, WidgetIndex widgetIndex, char *text);
static void WindowNetworkStatusInvalidate(rct_window *w);
static void WindowNetworkStatusPaint(rct_window *w, rct_drawpixelinfo *dpi);
@ -107,7 +107,7 @@ static void WindowNetworkStatusOnclose(rct_window* w)
}
}
static void WindowNetworkStatusMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowNetworkStatusMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -122,7 +122,7 @@ static void WindowNetworkStatusUpdate(rct_window* w)
widget_invalidate(*w, WIDX_BACKGROUND);
}
static void WindowNetworkStatusTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowNetworkStatusTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
_password[0] = '\0';
switch (widgetIndex)

6
src/openrct2-ui/windows/NewCampaign.cpp
View File

@ -175,7 +175,7 @@ public:
RefreshRides();
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
rct_widget* widget = &widgets[widgetIndex];
rct_widget* dropdownWidget;
@ -246,7 +246,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -269,7 +269,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
if (widgetIndex != WIDX_RIDE_DROPDOWN_BUTTON)
return;

6
src/openrct2-ui/windows/NewRide.cpp
View File

@ -328,7 +328,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -349,7 +349,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_7)
{
@ -885,7 +885,7 @@ private:
void DrawTabImage(rct_drawpixelinfo& dpi, NewRideTabId tab, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + tab;
WidgetIndex widgetIndex = WIDX_TAB_1 + tab;
if (widgets[widgetIndex].type != WindowWidgetType::Empty && !WidgetIsDisabled(*this, widgetIndex))
{

2
src/openrct2-ui/windows/News.cpp
View File

@ -67,7 +67,7 @@ public:
WidgetScrollUpdateThumbs(*this, WIDX_SCROLL);
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{

4
src/openrct2-ui/windows/NewsOptions.cpp
View File

@ -99,7 +99,7 @@ public:
colours[2] = COLOUR_LIGHT_BLUE;
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -227,7 +227,7 @@ private:
void DrawTabImage(rct_drawpixelinfo* dpi, int32_t p, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_FIRST_TAB + p;
WidgetIndex widgetIndex = WIDX_FIRST_TAB + p;
if (!WidgetIsDisabled(*this, widgetIndex))
{

2
src/openrct2-ui/windows/ObjectLoadError.cpp
View File

@ -404,7 +404,7 @@ public:
_invalidEntries.shrink_to_fit();
}
void OnMouseUp(const rct_widgetindex widgetIndex) override
void OnMouseUp(const WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{

56
src/openrct2-ui/windows/Options.cpp
View File

@ -422,7 +422,7 @@ public:
InitScrollWidgets();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
if (widgetIndex < WIDX_PAGE_START)
CommonMouseUp(widgetIndex);
@ -455,7 +455,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (page)
{
@ -485,7 +485,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
if (dropdownIndex == -1)
return;
@ -607,7 +607,7 @@ public:
}
}
OpenRCT2String OnTooltip(rct_widgetindex widgetIndex, StringId fallback) override
OpenRCT2String OnTooltip(WidgetIndex widgetIndex, StringId fallback) override
{
if (page == WINDOW_OPTIONS_PAGE_ADVANCED)
return AdvancedTooltip(widgetIndex, fallback);
@ -617,7 +617,7 @@ public:
private:
#pragma region Common events
void CommonMouseUp(rct_widgetindex widgetIndex)
void CommonMouseUp(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -676,7 +676,7 @@ private:
#pragma endregion
#pragma region Display tab events
void DisplayMouseUp(rct_widgetindex widgetIndex)
void DisplayMouseUp(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -722,7 +722,7 @@ private:
}
}
void DisplayMouseDown(rct_widgetindex widgetIndex)
void DisplayMouseDown(WidgetIndex widgetIndex)
{
rct_widget* widget = &widgets[widgetIndex - 1];
@ -806,7 +806,7 @@ private:
}
}
void DisplayDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void DisplayDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -921,7 +921,7 @@ private:
#pragma endregion
#pragma region Rendering tab events
void RenderingMouseUp(rct_widgetindex widgetIndex)
void RenderingMouseUp(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -991,7 +991,7 @@ private:
}
}
void RenderingMouseDown(rct_widgetindex widgetIndex)
void RenderingMouseDown(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -1011,7 +1011,7 @@ private:
}
}
void RenderingDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void RenderingDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -1080,7 +1080,7 @@ private:
#pragma endregion
#pragma region Culture tab events
void CultureMouseDown(rct_widgetindex widgetIndex)
void CultureMouseDown(WidgetIndex widgetIndex)
{
rct_widget* widget = &widgets[widgetIndex - 1];
@ -1170,7 +1170,7 @@ private:
}
}
void CultureDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void CultureDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -1289,7 +1289,7 @@ private:
#pragma endregion
#pragma region Audio tab events
void AudioMouseUp(rct_widgetindex widgetIndex)
void AudioMouseUp(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -1328,7 +1328,7 @@ private:
}
}
void AudioMouseDown(rct_widgetindex widgetIndex)
void AudioMouseDown(WidgetIndex widgetIndex)
{
rct_widget* widget = &widgets[widgetIndex - 1];
@ -1381,7 +1381,7 @@ private:
}
}
void AudioDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void AudioDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -1526,7 +1526,7 @@ private:
#pragma endregion
#pragma region Controls tab events
void ControlsMouseUp(rct_widgetindex widgetIndex)
void ControlsMouseUp(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -1603,7 +1603,7 @@ private:
}
}
void ControlsMouseDown(rct_widgetindex widgetIndex)
void ControlsMouseDown(WidgetIndex widgetIndex)
{
rct_widget* widget = &widgets[widgetIndex - 1];
@ -1628,7 +1628,7 @@ private:
}
}
void ControlsDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void ControlsDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -1665,7 +1665,7 @@ private:
#pragma endregion
#pragma region Misc tab events
void MiscMouseUp(rct_widgetindex widgetIndex)
void MiscMouseUp(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -1706,7 +1706,7 @@ private:
}
}
void MiscMouseDown(rct_widgetindex widgetIndex)
void MiscMouseDown(WidgetIndex widgetIndex)
{
rct_widget* widget = &widgets[widgetIndex - 1];
@ -1766,7 +1766,7 @@ private:
}
}
void MiscDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void MiscDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -1867,7 +1867,7 @@ private:
#pragma endregion
#pragma region Advanced tab events
void AdvancedMouseUp(rct_widgetindex widgetIndex)
void AdvancedMouseUp(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -1943,7 +1943,7 @@ private:
}
}
void AdvancedMouseDown(rct_widgetindex widgetIndex)
void AdvancedMouseDown(WidgetIndex widgetIndex)
{
rct_widget* widget = &widgets[widgetIndex - 1];
@ -1978,7 +1978,7 @@ private:
}
}
void AdvancedDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void AdvancedDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -2027,7 +2027,7 @@ private:
DrawTextEllipsised(dpi, screenCoords, 277, STR_STRING, ft, { colours[1] });
}
OpenRCT2String AdvancedTooltip(rct_widgetindex widgetIndex, StringId fallback)
OpenRCT2String AdvancedTooltip(WidgetIndex widgetIndex, StringId fallback)
{
if (widgetIndex == WIDX_PATH_TO_RCT1_BUTTON)
{
@ -2088,7 +2088,7 @@ private:
void DrawTabImage(rct_drawpixelinfo* dpi, int32_t p, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_FIRST_TAB + p;
WidgetIndex widgetIndex = WIDX_FIRST_TAB + p;
rct_widget* widget = &widgets[widgetIndex];
auto screenCoords = windowPos + ScreenCoordsXY{ widget->left, widget->top };
@ -2129,7 +2129,7 @@ private:
return static_cast<float>(scroll.h_left) / (scroll.h_right - w) * 100;
}
void InitializeScrollPosition(rct_widgetindex widgetIndex, int32_t scrollId, uint8_t volume)
void InitializeScrollPosition(WidgetIndex widgetIndex, int32_t scrollId, uint8_t volume)
{
const auto& widget = widgets[widgetIndex];
auto& scroll = scrolls[scrollId];

22
src/openrct2-ui/windows/Park.cpp
View File

@ -214,7 +214,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex idx) override
void OnMouseUp(WidgetIndex idx) override
{
switch (idx)
{
@ -270,7 +270,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex idx) override
void OnMouseDown(WidgetIndex idx) override
{
switch (page)
{
@ -283,7 +283,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t selectedIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t selectedIndex) override
{
switch (page)
{
@ -321,7 +321,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
switch (page)
{
@ -408,7 +408,7 @@ private:
}
#pragma region Entrance page
void OnMouseUpEntrance(rct_widgetindex widgetIndex)
void OnMouseUpEntrance(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -441,7 +441,7 @@ private:
InitViewport();
}
void OnMouseDownEntrance(rct_widgetindex widgetIndex)
void OnMouseDownEntrance(WidgetIndex widgetIndex)
{
if (widgetIndex == WIDX_OPEN_OR_CLOSE)
{
@ -466,7 +466,7 @@ private:
}
}
void OnDropdownEntrance(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void OnDropdownEntrance(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex == WIDX_OPEN_OR_CLOSE)
{
@ -490,7 +490,7 @@ private:
widget_invalidate(*this, WIDX_TAB_1);
}
void OnTextInputEntrance(rct_widgetindex widgetIndex, std::string_view text)
void OnTextInputEntrance(WidgetIndex widgetIndex, std::string_view text)
{
if (widgetIndex == WIDX_RENAME && !text.empty())
{
@ -821,7 +821,7 @@ private:
window_set_resize(*this, 230, 124, 230, 124);
}
void OnMouseDownPrice(rct_widgetindex widgetIndex)
void OnMouseDownPrice(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -1004,7 +1004,7 @@ private:
#pragma endregion
#pragma region Objective page
void OnMouseUpObjective(rct_widgetindex widgetIndex)
void OnMouseUpObjective(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -1032,7 +1032,7 @@ private:
widget_invalidate(*this, WIDX_TAB_6);
}
void OnTextInputObjective(rct_widgetindex widgetIndex, std::string_view text)
void OnTextInputObjective(WidgetIndex widgetIndex, std::string_view text)
{
if (widgetIndex == WIDX_ENTER_NAME && !text.empty())
{

14
src/openrct2-ui/windows/PatrolArea.cpp
View File

@ -68,7 +68,7 @@ public:
tool_cancel();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -81,7 +81,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -96,7 +96,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (text.empty())
return;
@ -146,7 +146,7 @@ public:
}
}
void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
auto mapTile = GetBestCoordsFromPos(screenCoords);
if (!mapTile)
@ -187,14 +187,14 @@ public:
}
}
void OnToolAbort(rct_widgetindex widgetIndex) override
void OnToolAbort(WidgetIndex widgetIndex) override
{
hide_gridlines();
ClearPatrolAreaToRender();
gfx_invalidate_screen();
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
auto mapTile = GetBestCoordsFromPos(screenCoords);
if (mapTile)
@ -209,7 +209,7 @@ public:
OnToolDrag(widgetIndex, screenCoords);
}
void OnToolDrag(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDrag(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
auto staff = GetEntity<Staff>(_staffId);
if (staff != nullptr)

16
src/openrct2-ui/windows/Player.cpp
View File

@ -82,10 +82,10 @@ static rct_widget *window_player_page_widgets[] = {
#pragma region Events
static void WindowPlayerOverviewClose(rct_window *w);
static void WindowPlayerOverviewMouseUp(rct_window *w, rct_widgetindex widgetIndex);
static void WindowPlayerOverviewMouseUp(rct_window *w, WidgetIndex widgetIndex);
static void WindowPlayerOverviewResize(rct_window *w);
static void WindowPlayerOverviewMouseDown(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
static void WindowPlayerOverviewDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowPlayerOverviewMouseDown(rct_window *w, WidgetIndex widgetIndex, rct_widget *widget);
static void WindowPlayerOverviewDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowPlayerOverviewUpdate(rct_window* w);
static void WindowPlayerOverviewInvalidate(rct_window *w);
static void WindowPlayerOverviewPaint(rct_window *w, rct_drawpixelinfo *dpi);
@ -103,7 +103,7 @@ static rct_window_event_list window_player_overview_events([](auto& events)
});
static void WindowPlayerStatisticsClose(rct_window *w);
static void WindowPlayerStatisticsMouseUp(rct_window *w, rct_widgetindex widgetIndex);
static void WindowPlayerStatisticsMouseUp(rct_window *w, WidgetIndex widgetIndex);
static void WindowPlayerStatisticsResize(rct_window *w);
static void WindowPlayerStatisticsUpdate(rct_window* w);
static void WindowPlayerStatisticsInvalidate(rct_window *w);
@ -200,7 +200,7 @@ void WindowPlayerOverviewClose(rct_window* w)
{
}
void WindowPlayerOverviewMouseUp(rct_window* w, rct_widgetindex widgetIndex)
void WindowPlayerOverviewMouseUp(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -238,7 +238,7 @@ void WindowPlayerOverviewMouseUp(rct_window* w, rct_widgetindex widgetIndex)
}
}
void WindowPlayerOverviewMouseDown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
void WindowPlayerOverviewMouseDown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -248,7 +248,7 @@ void WindowPlayerOverviewMouseDown(rct_window* w, rct_widgetindex widgetIndex, r
}
}
void WindowPlayerOverviewDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
void WindowPlayerOverviewDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
const auto playerId = static_cast<uint8_t>(w->number);
const auto playerIdx = network_get_player_index(playerId);
@ -428,7 +428,7 @@ void WindowPlayerStatisticsClose(rct_window* w)
}
}
void WindowPlayerStatisticsMouseUp(rct_window* w, rct_widgetindex widgetIndex)
void WindowPlayerStatisticsMouseUp(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{

2
src/openrct2-ui/windows/RefurbishRidePrompt.cpp
View File

@ -56,7 +56,7 @@ public:
WindowInitScrollWidgets(*this);
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{

22
src/openrct2-ui/windows/Research.cpp
View File

@ -100,14 +100,14 @@ static rct_widget *window_research_page_widgets[] = {
#pragma region Events
static void WindowResearchDevelopmentMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowResearchDevelopmentMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowResearchDevelopmentUpdate(rct_window *w);
static void WindowResearchDevelopmentInvalidate(rct_window *w);
static void WindowResearchDevelopmentPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowResearchFundingMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowResearchFundingMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowResearchFundingDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowResearchFundingMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowResearchFundingMousedown(rct_window *w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowResearchFundingDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowResearchFundingUpdate(rct_window *w);
static void WindowResearchFundingInvalidate(rct_window *w);
static void WindowResearchFundingPaint(rct_window *w, rct_drawpixelinfo *dpi);
@ -195,7 +195,7 @@ rct_window* WindowResearchOpen()
*
* rct2: 0x006B6B38
*/
static void WindowResearchDevelopmentMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowResearchDevelopmentMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -261,7 +261,7 @@ static void WindowResearchDevelopmentPaint(rct_window* w, rct_drawpixelinfo* dpi
WindowResearchDevelopmentPagePaint(w, dpi, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP);
}
void WindowResearchDevelopmentPagePaint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex)
void WindowResearchDevelopmentPagePaint(rct_window* w, rct_drawpixelinfo* dpi, WidgetIndex baseWidgetIndex)
{
baseWidgetIndex = baseWidgetIndex - WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP;
@ -391,7 +391,7 @@ void WindowResearchDevelopmentPagePaint(rct_window* w, rct_drawpixelinfo* dpi, r
*
* rct2: 0x0069DB3F
*/
static void WindowResearchFundingMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowResearchFundingMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -423,7 +423,7 @@ static void WindowResearchFundingMouseup(rct_window* w, rct_widgetindex widgetIn
*
* rct2: 0x0069DB66
*/
static void WindowResearchFundingMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowResearchFundingMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
rct_widget* dropdownWidget;
int32_t i;
@ -450,7 +450,7 @@ static void WindowResearchFundingMousedown(rct_window* w, rct_widgetindex widget
*
* rct2: 0x0069DB6D
*/
static void WindowResearchFundingDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowResearchFundingDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON || dropdownIndex == -1)
return;
@ -539,7 +539,7 @@ static void WindowResearchFundingPaint(rct_window* w, rct_drawpixelinfo* dpi)
WindowResearchFundingPagePaint(w, dpi, WIDX_RESEARCH_FUNDING);
}
void WindowResearchFundingPagePaint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex)
void WindowResearchFundingPagePaint(rct_window* w, rct_drawpixelinfo* dpi, WidgetIndex baseWidgetIndex)
{
if (gParkFlags & PARK_FLAGS_NO_MONEY)
return;
@ -598,7 +598,7 @@ static void WindowResearchSetPressedTab(rct_window* w)
static void WindowResearchDrawTabImage(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
WidgetIndex widgetIndex = WIDX_TAB_1 + page;
if (!WidgetIsDisabled(*w, widgetIndex))
{

156
src/openrct2-ui/windows/Ride.cpp
View File

@ -431,99 +431,99 @@ static constexpr const uint64_t window_ride_page_hold_down_widgets[] = {
static void WindowRideInitViewport(rct_window* w);
static void WindowRideMainMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideMainMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideMainResize(rct_window* w);
static void WindowRideMainMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideMainDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowRideMainMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowRideMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowRideMainUpdate(rct_window* w);
static void WindowRideMainTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowRideMainTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
static void WindowRideMainViewportRotate(rct_window* w);
static void WindowRideMainInvalidate(rct_window* w);
static void WindowRideMainPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowRideMainFollowRide(rct_window* w);
static void WindowRideVehicleMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideVehicleMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideVehicleResize(rct_window* w);
static void WindowRideVehicleMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideVehicleDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowRideVehicleMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowRideVehicleDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowRideVehicleUpdate(rct_window* w);
static OpenRCT2String WindowRideVehicleTooltip(rct_window* const w, const rct_widgetindex widgetIndex, StringId fallback);
static OpenRCT2String WindowRideVehicleTooltip(rct_window* const w, const WidgetIndex widgetIndex, StringId fallback);
static void WindowRideVehicleInvalidate(rct_window* w);
static void WindowRideVehiclePaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowRideVehicleScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void WindowRideOperatingMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideOperatingMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideOperatingResize(rct_window* w);
static void WindowRideOperatingMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideOperatingLengthWindow(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowRideOperatingLengthWindow(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideOperatingTweakTextInput(rct_window* w, const Ride& ride);
static void WindowRideOperatingDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowRideOperatingDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowRideOperatingUpdate(rct_window* w);
static void WindowRideOperatingTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowRideOperatingTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
static void WindowRideOperatingInvalidate(rct_window* w);
static void WindowRideOperatingPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowRideMaintenanceMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideMaintenanceMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideMaintenanceResize(rct_window* w);
static void WindowRideMaintenanceMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideMaintenanceDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowRideMaintenanceMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowRideMaintenanceDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowRideMaintenanceUpdate(rct_window* w);
static void WindowRideMaintenanceInvalidate(rct_window* w);
static void WindowRideMaintenancePaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowRideColourClose(rct_window* w);
static void WindowRideColourMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideColourMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideColourResize(rct_window* w);
static void WindowRideColourMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideColourDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowRideColourMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowRideColourDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowRideColourUpdate(rct_window* w);
static void WindowRideColourTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideColourTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideColourTooldown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideColourTooldrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideColourInvalidate(rct_window* w);
static void WindowRideColourPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowRideColourScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void WindowRideMusicMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideMusicMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideMusicResize(rct_window* w);
static void WindowRideMusicMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideMusicDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowRideMusicMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowRideMusicDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowRideMusicUpdate(rct_window* w);
static void WindowRideMusicInvalidate(rct_window* w);
static void WindowRideMusicPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowRideMeasurementsClose(rct_window* w);
static void WindowRideMeasurementsMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideMeasurementsMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideMeasurementsResize(rct_window* w);
static void WindowRideMeasurementsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideMeasurementsDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowRideMeasurementsMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowRideMeasurementsDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowRideMeasurementsUpdate(rct_window* w);
static void WindowRideMeasurementsTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideMeasurementsTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideMeasurementsToolabort(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideMeasurementsTooldown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideMeasurementsTooldrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowRideMeasurementsToolabort(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideMeasurementsInvalidate(rct_window* w);
static void WindowRideMeasurementsPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowRideGraphsMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideGraphsMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideGraphsResize(rct_window* w);
static void WindowRideGraphsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideGraphsMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowRideGraphsUpdate(rct_window* w);
static void WindowRideGraphsScrollgetheight(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowRideGraphs15(rct_window* w, int32_t scrollIndex, int32_t scrollAreaType);
static OpenRCT2String WindowRideGraphsTooltip(rct_window* w, const rct_widgetindex widgetIndex, const StringId fallback);
static OpenRCT2String WindowRideGraphsTooltip(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback);
static void WindowRideGraphsInvalidate(rct_window* w);
static void WindowRideGraphsPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowRideGraphsScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
static void WindowRideIncomeMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideIncomeMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideIncomeResize(rct_window* w);
static void WindowRideIncomeMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowRideIncomeMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowRideIncomeUpdate(rct_window* w);
static void WindowRideIncomeTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowRideIncomeTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
static void WindowRideIncomeInvalidate(rct_window* w);
static void WindowRideIncomePaint(rct_window* w, rct_drawpixelinfo* dpi);
static bool WindowRideIncomeCanModifyPrimaryPrice(rct_window* w);
static void WindowRideCustomerMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowRideCustomerMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowRideCustomerResize(rct_window* w);
static void WindowRideCustomerUpdate(rct_window* w);
static void WindowRideCustomerInvalidate(rct_window* w);
@ -864,7 +864,7 @@ static std::vector<VehicleTypeLabel> VehicleDropdownData;
static void WindowRideDrawTabImage(rct_drawpixelinfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + page;
WidgetIndex widgetIndex = WIDX_TAB_1 + page;
if (!WidgetIsDisabled(*w, widgetIndex))
{
@ -885,7 +885,7 @@ static void WindowRideDrawTabImage(rct_drawpixelinfo* dpi, rct_window* w, int32_
*/
static void WindowRideDrawTabMain(rct_drawpixelinfo* dpi, rct_window* w)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_MAIN;
WidgetIndex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_MAIN;
if (!WidgetIsDisabled(*w, widgetIndex))
{
auto ride = get_ride(w->rideId);
@ -923,7 +923,7 @@ static void WindowRideDrawTabMain(rct_drawpixelinfo* dpi, rct_window* w)
*/
static void WindowRideDrawTabVehicle(rct_drawpixelinfo* dpi, rct_window* w)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_VEHICLE;
WidgetIndex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_VEHICLE;
const auto& widget = w->widgets[widgetIndex];
if (!WidgetIsDisabled(*w, widgetIndex))
@ -994,7 +994,7 @@ static void WindowRideDrawTabVehicle(rct_drawpixelinfo* dpi, rct_window* w)
*/
static void WindowRideDrawTabCustomer(rct_drawpixelinfo* dpi, rct_window* w)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_CUSTOMER;
WidgetIndex widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_CUSTOMER;
if (!WidgetIsDisabled(*w, widgetIndex))
{
@ -1622,7 +1622,7 @@ static void WindowRideRename(rct_window* w)
*
* rct2: 0x006AF17E
*/
static void WindowRideMainMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideMainMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -2099,7 +2099,7 @@ static void WindowRideShowVehicleTypeDropdown(rct_window* w, rct_widget* widget)
*
* rct2: 0x006AF1BD
*/
static void WindowRideMainMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideMainMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -2122,7 +2122,7 @@ static void WindowRideMainMousedown(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006AF300
*/
static void WindowRideMainDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowRideMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -2258,7 +2258,7 @@ static void WindowRideMainUpdate(rct_window* w)
*
* rct2: 0x006AF2F9
*/
static void WindowRideMainTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowRideMainTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if (widgetIndex != WIDX_RENAME || text == nullptr)
return;
@ -2624,7 +2624,7 @@ static void WindowRideMainPaint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006B272D
*/
static void WindowRideVehicleMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideVehicleMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -2659,7 +2659,7 @@ static void WindowRideVehicleResize(rct_window* w)
*
* rct2: 0x006B2748
*/
static void WindowRideVehicleMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideVehicleMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
auto ride = get_ride(w->rideId);
if (ride == nullptr)
@ -2694,7 +2694,7 @@ static void WindowRideVehicleMousedown(rct_window* w, rct_widgetindex widgetInde
*
* rct2: 0x006B2767
*/
static void WindowRideVehicleDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowRideVehicleDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -2726,7 +2726,7 @@ static void WindowRideVehicleUpdate(rct_window* w)
widget_invalidate(*w, WIDX_TAB_2);
}
static OpenRCT2String WindowRideVehicleTooltip(rct_window* const w, const rct_widgetindex widgetIndex, StringId fallback)
static OpenRCT2String WindowRideVehicleTooltip(rct_window* const w, const WidgetIndex widgetIndex, StringId fallback)
{
auto ride = get_ride(w->rideId);
if (ride == nullptr)
@ -3148,7 +3148,7 @@ static void WindowRideLoadDropdown(rct_window* w, rct_widget* widget)
*
* rct2: 0x006B10A7
*/
static void WindowRideOperatingMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideOperatingMouseup(rct_window* w, WidgetIndex widgetIndex)
{
const auto rideId = w->rideId;
auto ride = get_ride(rideId);
@ -3205,7 +3205,7 @@ static void WindowRideOperatingResize(rct_window* w)
*
* rct2: 0x006B10F4
*/
static void WindowRideOperatingMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
const auto rideId = w->rideId;
auto ride = get_ride(rideId);
@ -3297,7 +3297,7 @@ static void WindowRideOperatingMousedown(rct_window* w, rct_widgetindex widgetIn
}
}
static void WindowRideOperatingLengthWindow(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideOperatingLengthWindow(rct_window* w, WidgetIndex widgetIndex)
{
auto ride = get_ride(w->rideId);
if (ride == nullptr)
@ -3350,7 +3350,7 @@ static void WindowRideOperatingTweakTextInput(rct_window* w, const Ride& ride)
*
* rct2: 0x006B1165
*/
static void WindowRideOperatingDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowRideOperatingDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -3408,7 +3408,7 @@ static void WindowRideOperatingUpdate(rct_window* w)
}
}
static void WindowRideOperatingTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowRideOperatingTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if (text == nullptr)
return;
@ -3788,7 +3788,7 @@ static void WindowRideMaintenanceDrawBar(
*
* rct2: 0x006B1AAD
*/
static void WindowRideMaintenanceMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideMaintenanceMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -3829,7 +3829,7 @@ static void WindowRideMaintenanceResize(rct_window* w)
*
* rct2: 0x006B1ACE
*/
static void WindowRideMaintenanceMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideMaintenanceMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
auto ride = get_ride(w->rideId);
if (ride == nullptr)
@ -3930,7 +3930,7 @@ static void WindowRideMaintenanceMousedown(rct_window* w, rct_widgetindex widget
*
* rct2: 0x006B1AD9
*/
static void WindowRideMaintenanceDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowRideMaintenanceDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -4295,7 +4295,7 @@ static void WindowRideColourClose(rct_window* w)
*
* rct2: 0x006B02A1
*/
static void WindowRideColourMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideColourMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -4343,7 +4343,7 @@ static void WindowRideColourResize(rct_window* w)
*
* rct2: 0x006B02C6
*/
static void WindowRideColourMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideColourMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
VehicleColour vehicleColour;
int32_t i, numItems;
@ -4477,7 +4477,7 @@ static void WindowRideColourMousedown(rct_window* w, rct_widgetindex widgetIndex
*
* rct2: 0x006B0331
*/
static void WindowRideColourDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowRideColourDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
return;
@ -4595,7 +4595,7 @@ static void WindowRideColourUpdate(rct_window* w)
*
* rct2: 0x006B04EC
*/
static void WindowRideColourTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowRideColourTooldown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
WindowRideSetTrackColourScheme(w, screenCoords);
@ -4605,7 +4605,7 @@ static void WindowRideColourTooldown(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006B04F3
*/
static void WindowRideColourTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowRideColourTooldrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
WindowRideSetTrackColourScheme(w, screenCoords);
@ -5045,7 +5045,7 @@ static void WindowRideToggleMusic(rct_window* w)
*
* rct2: 0x006B1ED7
*/
static void WindowRideMusicMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideMusicMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -5093,7 +5093,7 @@ static std::string GetMusicString(ObjectEntryIndex musicObjectIndex)
*
* rct2: 0x006B1EFC
*/
static void WindowRideMusicMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideMusicMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
if (widgetIndex != WIDX_MUSIC_DROPDOWN)
return;
@ -5171,7 +5171,7 @@ static void WindowRideMusicMousedown(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006B1F03
*/
static void WindowRideMusicDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowRideMusicDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex == WIDX_MUSIC_DROPDOWN && dropdownIndex >= 0
&& static_cast<size_t>(dropdownIndex) < window_ride_current_music_style_order.size())
@ -5401,7 +5401,7 @@ static void WindowRideMeasurementsClose(rct_window* w)
*
* rct2: 0x006AD478
*/
static void WindowRideMeasurementsMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideMeasurementsMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -5448,7 +5448,7 @@ static void WindowRideMeasurementsResize(rct_window* w)
*
* rct2: 0x006AD4AB
*/
static void WindowRideMeasurementsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideMeasurementsMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
if (widgetIndex != WIDX_SAVE_TRACK_DESIGN)
return;
@ -5476,7 +5476,7 @@ static void WindowRideMeasurementsMousedown(rct_window* w, rct_widgetindex widge
*
* rct2: 0x006AD4B2
*/
static void WindowRideMeasurementsDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowRideMeasurementsDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex != WIDX_SAVE_TRACK_DESIGN)
return;
@ -5507,7 +5507,7 @@ static void WindowRideMeasurementsUpdate(rct_window* w)
*
* rct2: 0x006D2AE7
*/
static void WindowRideMeasurementsTooldown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowRideMeasurementsTooldown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
_lastSceneryX = screenCoords.x;
_lastSceneryY = screenCoords.y;
@ -5531,7 +5531,7 @@ static void WindowRideMeasurementsTooldown(rct_window* w, rct_widgetindex widget
}
}
static void WindowRideMeasurementsTooldrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowRideMeasurementsTooldrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (screenCoords.x == _lastSceneryX && screenCoords.y == _lastSceneryY)
return;
@ -5559,7 +5559,7 @@ static void WindowRideMeasurementsTooldrag(rct_window* w, rct_widgetindex widget
*
* rct2: 0x006AD4DA
*/
static void WindowRideMeasurementsToolabort(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideMeasurementsToolabort(rct_window* w, WidgetIndex widgetIndex)
{
WindowRideMeasurementsDesignCancel();
}
@ -5894,7 +5894,7 @@ static void WindowRideSetGraph(rct_window* w, int32_t type)
*
* rct2: 0x006AE85D
*/
static void WindowRideGraphsMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideGraphsMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -5929,7 +5929,7 @@ static void WindowRideGraphsResize(rct_window* w)
*
* rct2: 0x006AE878
*/
static void WindowRideGraphsMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideGraphsMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -6017,7 +6017,7 @@ static void WindowRideGraphs15(rct_window* w, int32_t scrollIndex, int32_t scrol
*
* rct2: 0x006AEA05
*/
static OpenRCT2String WindowRideGraphsTooltip(rct_window* w, const rct_widgetindex widgetIndex, const StringId fallback)
static OpenRCT2String WindowRideGraphsTooltip(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback)
{
if (widgetIndex == WIDX_GRAPH)
{
@ -6484,7 +6484,7 @@ static void WindowRideIncomeDecreaseSecondaryPrice(rct_window* w)
*
* rct2: 0x006ADEA9
*/
static void WindowRideIncomeMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideIncomeMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -6549,7 +6549,7 @@ static void WindowRideIncomeResize(rct_window* w)
*
* rct2: 0x006ADED4
*/
static void WindowRideIncomeMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowRideIncomeMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -6586,7 +6586,7 @@ static void WindowRideIncomeUpdate(rct_window* w)
}
}
static void WindowRideIncomeTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowRideIncomeTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if ((widgetIndex != WIDX_PRIMARY_PRICE && widgetIndex != WIDX_SECONDARY_PRICE) || text == nullptr)
return;
@ -6836,7 +6836,7 @@ static void WindowRideIncomePaint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006AD986
*/
static void WindowRideCustomerMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowRideCustomerMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{

14
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -853,7 +853,7 @@ public:
if (currentDisabledWidgets == disabledWidgets)
return;
for (rct_widgetindex i = 0; i < 64; i++)
for (WidgetIndex i = 0; i < 64; i++)
{
if ((disabledWidgets & (1ULL << i)) != (currentDisabledWidgets & (1ULL << i)))
{
@ -925,7 +925,7 @@ public:
UpdateGhostTrackAndArrow();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
WindowRideConstructionUpdateEnabledTrackPieces();
switch (widgetIndex)
@ -970,7 +970,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
auto currentRide = get_ride(_currentRideIndex);
if (currentRide == nullptr)
@ -1374,7 +1374,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t selectedIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t selectedIndex) override
{
if (widgetIndex != WIDX_SPECIAL_TRACK_DROPDOWN)
return;
@ -1401,7 +1401,7 @@ public:
window_ride_construction_update_active_elements();
}
void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
switch (widgetIndex)
{
@ -1415,7 +1415,7 @@ public:
}
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
switch (widgetIndex)
{
@ -1964,7 +1964,7 @@ public:
return;
}
rct_widgetindex widgetIndex;
WidgetIndex widgetIndex;
switch (_currentTrackCurve)
{
case TRACK_CURVE_NONE:

6
src/openrct2-ui/windows/RideList.cpp
View File

@ -212,7 +212,7 @@ public:
*
* rct2: 0x006B3511
*/
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -263,7 +263,7 @@ public:
*
* rct2: 0x006B3532
*/
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
if (widgetIndex == WIDX_OPEN_CLOSE_ALL)
{
@ -318,7 +318,7 @@ public:
*
* rct2: 0x006B3547
*/
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
if (widgetIndex == WIDX_OPEN_CLOSE_ALL)
{

4
src/openrct2-ui/windows/SavePrompt.cpp
View File

@ -68,7 +68,7 @@ static constexpr const StringId window_save_prompt_labels[][2] = {
static void WindowSavePromptClose(rct_window *w);
static void WindowSavePromptMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowSavePromptMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowSavePromptPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowSavePromptCallback(int32_t result, const utf8 * path);
@ -189,7 +189,7 @@ static void WindowSavePromptClose(rct_window* w)
*
* rct2: 0x0066DDF2
*/
static void WindowSavePromptMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowSavePromptMouseup(rct_window* w, WidgetIndex widgetIndex)
{
if (gScreenFlags & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER))
{

8
src/openrct2-ui/windows/ScenarioSelect.cpp
View File

@ -104,8 +104,8 @@ static constexpr const StringId ScenarioOriginStringIds[] = {
static void WindowScenarioselectInitTabs(rct_window *w);
static void WindowScenarioselectClose(rct_window *w);
static void WindowScenarioselectMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowScenarioselectMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowScenarioselectMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowScenarioselectMousedown(rct_window *w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowScenarioselectScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void WindowScenarioselectScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowScenarioselectScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
@ -264,7 +264,7 @@ static void WindowScenarioselectClose(rct_window* w)
_listItems.shrink_to_fit();
}
static void WindowScenarioselectMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowScenarioselectMouseup(rct_window* w, WidgetIndex widgetIndex)
{
if (widgetIndex == WIDX_CLOSE)
{
@ -272,7 +272,7 @@ static void WindowScenarioselectMouseup(rct_window* w, rct_widgetindex widgetInd
}
}
static void WindowScenarioselectMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowScenarioselectMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
if (widgetIndex >= WIDX_TAB1 && widgetIndex <= WIDX_TAB8)
{

14
src/openrct2-ui/windows/Scenery.cpp
View File

@ -177,7 +177,7 @@ public:
tool_cancel();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -264,7 +264,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -289,7 +289,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
if (dropdownIndex == -1)
return;
@ -316,7 +316,7 @@ public:
{
// Find out what scenery the cursor is over
const CursorState* state = context_get_cursor_state();
rct_widgetindex widgetIndex = window_find_widget_from_point(*this, state->position);
WidgetIndex widgetIndex = window_find_widget_from_point(*this, state->position);
if (widgetIndex == WIDX_SCENERY_LIST)
{
ScreenCoordsXY scrollPos = {};
@ -350,7 +350,7 @@ public:
if (window.y < 44 || window.x <= width)
{
rct_widgetindex widgetIndex = window_find_widget_from_point(*this, state->position);
WidgetIndex widgetIndex = window_find_widget_from_point(*this, state->position);
if (widgetIndex >= WIDX_SCENERY_TAB_CONTENT_PANEL)
{
_hoverCounter++;
@ -459,7 +459,7 @@ public:
}
}
OpenRCT2String OnTooltip(const rct_widgetindex widgetIndex, const StringId fallback) override
OpenRCT2String OnTooltip(const WidgetIndex widgetIndex, const StringId fallback) override
{
if (widgetIndex >= WIDX_SCENERY_TAB_1)
{
@ -1178,7 +1178,7 @@ private:
{
for (size_t tabIndex = 0; tabIndex < _tabEntries.size(); tabIndex++)
{
auto widgetIndex = static_cast<rct_widgetindex>(WIDX_SCENERY_TAB_1 + tabIndex);
auto widgetIndex = static_cast<WidgetIndex>(WIDX_SCENERY_TAB_1 + tabIndex);
auto scgEntry = _tabEntries[tabIndex].GetSceneryGroupEntry();
if (scgEntry != nullptr)
{

8
src/openrct2-ui/windows/SceneryScatter.cpp
View File

@ -72,7 +72,7 @@ public:
gWindowSceneryScatterEnabled = false;
}
void InputSize(const rct_widgetindex widgetIndex)
void InputSize(const WidgetIndex widgetIndex)
{
uint8_t maxLength = 0;
Formatter ft;
@ -88,7 +88,7 @@ public:
WindowTextInputOpen(this, widgetIndex, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, ft, STR_NONE, STR_NONE, maxLength);
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -114,7 +114,7 @@ public:
}
}
void OnMouseDown(const rct_widgetindex widgetIndex) override
void OnMouseDown(const WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -132,7 +132,7 @@ public:
}
}
void OnTextInput(const rct_widgetindex widgetIndex, const std::string_view text) override
void OnTextInput(const WidgetIndex widgetIndex, const std::string_view text) override
{
if (widgetIndex != WIDX_PREVIEW || text.empty())
return;

16
src/openrct2-ui/windows/ServerList.cpp
View File

@ -74,15 +74,15 @@ static rct_widget window_server_list_widgets[] = {
// clang-format on
static void WindowServerListClose(rct_window* w);
static void WindowServerListMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowServerListMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowServerListResize(rct_window* w);
static void WindowServerListDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowServerListDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowServerListUpdate(rct_window* w);
static void WindowServerListScrollGetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowServerListScrollMousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowServerListScrollMouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowServerListTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static OpenRCT2String WindowServerListTooltip(rct_window* const w, const rct_widgetindex widgetIndex, StringId fallback);
static void WindowServerListTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
static OpenRCT2String WindowServerListTooltip(rct_window* const w, const WidgetIndex widgetIndex, StringId fallback);
static void WindowServerListInvalidate(rct_window* w);
static void WindowServerListPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowServerListScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
@ -160,7 +160,7 @@ static void WindowServerListClose(rct_window* w)
_fetchFuture = {};
}
static void WindowServerListMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowServerListMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -206,7 +206,7 @@ static void WindowServerListResize(rct_window* w)
window_set_resize(*w, WWIDTH_MIN, WHEIGHT_MIN, WWIDTH_MAX, WHEIGHT_MAX);
}
static void WindowServerListDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowServerListDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
auto serverIndex = w->selected_list_item;
if (serverIndex >= 0 && serverIndex < static_cast<int32_t>(_serverList.GetCount()))
@ -304,7 +304,7 @@ static void WindowServerListScrollMouseover(rct_window* w, int32_t scrollIndex,
}
}
static void WindowServerListTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowServerListTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if (text == nullptr || text[0] == 0)
return;
@ -344,7 +344,7 @@ static void WindowServerListTextinput(rct_window* w, rct_widgetindex widgetIndex
}
}
static OpenRCT2String WindowServerListTooltip(rct_window* const w, const rct_widgetindex widgetIndex, StringId fallback)
static OpenRCT2String WindowServerListTooltip(rct_window* const w, const WidgetIndex widgetIndex, StringId fallback)
{
auto ft = Formatter();
ft.Add<char*>(_version.c_str());

4
src/openrct2-ui/windows/ServerStart.cpp
View File

@ -89,7 +89,7 @@ public:
safe_strcpy(_description, gConfigNetwork.server_description.c_str(), sizeof(_description));
safe_strcpy(_greeting, gConfigNetwork.server_greeting.c_str(), sizeof(_greeting));
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -165,7 +165,7 @@ public:
widget_invalidate(*this, WIDX_PASSWORD_INPUT);
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (text.empty())
return;

14
src/openrct2-ui/windows/ShortcutKeys.cpp
View File

@ -106,7 +106,7 @@ public:
NotifyShortcutKeysWindow();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -208,10 +208,10 @@ public:
}
_tabAnimationIndex++;
InvalidateWidget(static_cast<rct_widgetindex>(WIDX_TAB_0 + _currentTabIndex));
InvalidateWidget(static_cast<WidgetIndex>(WIDX_TAB_0 + _currentTabIndex));
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -245,14 +245,14 @@ public:
widgets[WIDX_SCROLL].bottom = height - 19;
widgets[WIDX_RESET].top = height - 16;
widgets[WIDX_RESET].bottom = height - 5;
window_align_tabs(this, WIDX_TAB_0, static_cast<rct_widgetindex>(WIDX_TAB_0 + _tabs.size()));
window_align_tabs(this, WIDX_TAB_0, static_cast<WidgetIndex>(WIDX_TAB_0 + _tabs.size()));
// Set selected tab
for (size_t i = 0; i < _tabs.size(); i++)
{
SetWidgetPressed(static_cast<rct_widgetindex>(WIDX_TAB_0 + i), false);
SetWidgetPressed(static_cast<WidgetIndex>(WIDX_TAB_0 + i), false);
}
SetWidgetPressed(static_cast<rct_widgetindex>(WIDX_TAB_0 + _currentTabIndex), true);
SetWidgetPressed(static_cast<WidgetIndex>(WIDX_TAB_0 + _currentTabIndex), true);
}
void OnDraw(rct_drawpixelinfo& dpi) override
@ -485,7 +485,7 @@ private:
void DrawTabImage(rct_drawpixelinfo& dpi, size_t tabIndex) const
{
const auto& tabDesc = _tabs[tabIndex];
auto widgetIndex = static_cast<rct_widgetindex>(WIDX_TAB_0 + tabIndex);
auto widgetIndex = static_cast<WidgetIndex>(WIDX_TAB_0 + tabIndex);
if (!IsWidgetDisabled(widgetIndex))
{
auto imageId = tabDesc.ImageId;

8
src/openrct2-ui/windows/Sign.cpp
View File

@ -141,7 +141,7 @@ public:
return true;
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
auto* banner = GetBanner(GetBannerIndex());
if (banner == nullptr)
@ -185,7 +185,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
rct_widget* widget = &widgets[widgetIndex];
switch (widgetIndex)
@ -199,7 +199,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
switch (widgetIndex)
{
@ -228,7 +228,7 @@ public:
Invalidate();
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
if (widgetIndex == WIDX_SIGN_TEXT && !text.empty())
{

40
src/openrct2-ui/windows/Staff.cpp
View File

@ -143,7 +143,7 @@ public:
CancelTools();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
if (widgetIndex <= WIDX_TAB_3)
CommonMouseUp(widgetIndex);
@ -160,7 +160,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (page)
{
@ -173,7 +173,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
switch (page)
{
@ -251,7 +251,7 @@ public:
}
}
void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
switch (page)
{
@ -261,7 +261,7 @@ public:
}
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
switch (page)
{
@ -271,7 +271,7 @@ public:
}
}
void OnToolAbort(rct_widgetindex widgetIndex) override
void OnToolAbort(WidgetIndex widgetIndex) override
{
switch (page)
{
@ -291,7 +291,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
switch (page)
{
@ -303,7 +303,7 @@ public:
private:
#pragma region Common events
void CommonMouseUp(rct_widgetindex widgetIndex)
void CommonMouseUp(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -358,7 +358,7 @@ private:
#pragma endregion
#pragma region Overview tab events
void OverviewMouseUp(rct_widgetindex widgetIndex)
void OverviewMouseUp(WidgetIndex widgetIndex)
{
auto staff = GetStaff();
if (staff == nullptr)
@ -405,7 +405,7 @@ private:
}
}
void OverviewOnMouseDown(rct_widgetindex widgetIndex)
void OverviewOnMouseDown(WidgetIndex widgetIndex)
{
rct_widget* widget = &widgets[widgetIndex];
@ -440,7 +440,7 @@ private:
}
}
void OverviewOnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void OverviewOnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -646,7 +646,7 @@ private:
InvalidateWidget(WIDX_TAB_1);
}
void OverviewToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void OverviewToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -688,7 +688,7 @@ private:
gPickupPeepImage = ImageId(baseImageId, staff->TshirtColour, staff->TrousersColour);
}
void OverviewToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void OverviewToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -712,7 +712,7 @@ private:
GameActions::Execute(&pickupAction);
}
void OverviewToolAbort(rct_widgetindex widgetIndex)
void OverviewToolAbort(WidgetIndex widgetIndex)
{
if (widgetIndex != WIDX_PICKUP)
return;
@ -729,7 +729,7 @@ private:
ViewportInit();
}
void OverviewTextInput(rct_widgetindex widgetIndex, std::string_view text)
void OverviewTextInput(WidgetIndex widgetIndex, std::string_view text)
{
if (widgetIndex != WIDX_RENAME)
return;
@ -743,7 +743,7 @@ private:
#pragma endregion
#pragma region Options tab events
void OptionsMouseUp(rct_widgetindex widgetIndex)
void OptionsMouseUp(WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -756,7 +756,7 @@ private:
}
}
void OptionsOnMouseDown(rct_widgetindex widgetIndex)
void OptionsOnMouseDown(WidgetIndex widgetIndex)
{
if (widgetIndex != WIDX_COSTUME_BTN)
{
@ -799,7 +799,7 @@ private:
}
}
void OptionsOnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex)
void OptionsOnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex != WIDX_COSTUME_BTN)
{
@ -1046,7 +1046,7 @@ private:
return;
}
for (rct_widgetindex widgetIndex = WIDX_TAB_1; widgets[widgetIndex].type != WIDGETS_END.type; widgetIndex++)
for (WidgetIndex widgetIndex = WIDX_TAB_1; widgets[widgetIndex].type != WIDGETS_END.type; widgetIndex++)
{
SetWidgetDisabled(widgetIndex, false);
}
@ -1212,7 +1212,7 @@ private:
void DrawTabImage(rct_drawpixelinfo* dpi, int32_t p, int32_t baseImageId)
{
rct_widgetindex widgetIndex = WIDX_TAB_1 + p;
WidgetIndex widgetIndex = WIDX_TAB_1 + p;
rct_widget* widget = &widgets[widgetIndex];
auto screenCoords = windowPos + ScreenCoordsXY{ widget->left, widget->top };

4
src/openrct2-ui/windows/StaffFirePrompt.cpp
View File

@ -39,7 +39,7 @@ static rct_widget window_staff_fire_widgets[] = {
WIDGETS_END,
};
static void WindowStaffFireMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowStaffFireMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowStaffFirePaint(rct_window *w, rct_drawpixelinfo *dpi);
//0x9A3F7C
@ -76,7 +76,7 @@ rct_window* WindowStaffFirePromptOpen(Peep* peep)
*
* rct2: 0x006C0B40
*/
static void WindowStaffFireMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowStaffFireMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{

10
src/openrct2-ui/windows/StaffList.cpp
View File

@ -120,7 +120,7 @@ public:
CancelTools();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -203,7 +203,7 @@ public:
RefreshList();
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -228,7 +228,7 @@ public:
}
}
void OnDropdown(rct_widgetindex widgetIndex, int32_t dropdownIndex) override
void OnDropdown(WidgetIndex widgetIndex, int32_t dropdownIndex) override
{
if (widgetIndex == WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER)
{
@ -446,7 +446,7 @@ public:
}
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
if (widgetIndex == WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON)
{
@ -466,7 +466,7 @@ public:
}
}
void OnToolAbort(rct_widgetindex widgetIndex) override
void OnToolAbort(WidgetIndex widgetIndex) override
{
if (widgetIndex == WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON)
{

8
src/openrct2-ui/windows/TextInput.cpp
View File

@ -65,7 +65,7 @@ public:
SetParentWindow(nullptr, 0);
}
void SetParentWindow(rct_window* parentWindow, rct_widgetindex widgetIndex)
void SetParentWindow(rct_window* parentWindow, WidgetIndex widgetIndex)
{
// Save calling window details so that the information can be passed back to the correct window & widget
if (parentWindow == nullptr)
@ -147,7 +147,7 @@ public:
Invalidate();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -371,7 +371,7 @@ private:
};
void WindowTextInputRawOpen(
rct_window* call_w, rct_widgetindex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
rct_window* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
const_utf8string existing_text, int32_t maxLength)
{
window_close_by_class(WindowClass::Textinput);
@ -401,7 +401,7 @@ void WindowTextInputOpen(
}
void WindowTextInputOpen(
rct_window* call_w, rct_widgetindex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
rct_window* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
StringId existing_text, uintptr_t existing_args, int32_t maxLength)
{
auto existingText = format_string(existing_text, &existing_args);

18
src/openrct2-ui/windows/Themes.cpp
View File

@ -36,15 +36,15 @@ enum
WINDOW_THEMES_TAB_COUNT
};
static void WindowThemesMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowThemesMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowThemesResize(rct_window* w);
static void WindowThemesMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowThemesDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowThemesMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowThemesDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowThemesUpdate(rct_window* w);
static void WindowThemesScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowThemesScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowThemesScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowThemesTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text);
static void WindowThemesTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
static void WindowThemesInvalidate(rct_window* w);
static void WindowThemesPaint(rct_window* w, rct_drawpixelinfo* dpi);
static void WindowThemesScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
@ -340,7 +340,7 @@ rct_window* WindowThemesOpen()
return window;
}
static void WindowThemesMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowThemesMouseup(rct_window* w, WidgetIndex widgetIndex)
{
size_t activeAvailableThemeIndex;
const utf8* activeThemeName;
@ -472,7 +472,7 @@ static void WindowThemesResize(rct_window* w)
}
}
static void WindowThemesMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowThemesMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
int16_t newSelectedTab;
int32_t num_items;
@ -564,7 +564,7 @@ static void WindowThemesMousedown(rct_window* w, rct_widgetindex widgetIndex, rc
}
}
static void WindowThemesDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowThemesDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -689,7 +689,7 @@ void WindowThemesScrollmouseover(rct_window* w, int32_t scrollIndex, const Scree
{
}
static void WindowThemesTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowThemesTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if (text == nullptr || text[0] == 0)
return;
@ -731,7 +731,7 @@ void WindowThemesInvalidate(rct_window* w)
& ~((1LL << WIDX_THEMES_SETTINGS_TAB) | (1LL << WIDX_THEMES_MAIN_UI_TAB) | (1LL << WIDX_THEMES_PARK_TAB)
| (1LL << WIDX_THEMES_TOOLS_TAB) | (1LL << WIDX_THEMES_RIDE_PEEPS_TAB) | (1LL << WIDX_THEMES_EDITORS_TAB)
| (1LL << WIDX_THEMES_MISC_TAB) | (1LL << WIDX_THEMES_PROMPTS_TAB) | (1LL << WIDX_THEMES_FEATURES_TAB));
rct_widgetindex widgetIndex = _selected_tab + WIDX_THEMES_SETTINGS_TAB;
WidgetIndex widgetIndex = _selected_tab + WIDX_THEMES_SETTINGS_TAB;
w->pressed_widgets = pressed_widgets | (1 << widgetIndex);

24
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -447,15 +447,15 @@ static bool windowTileInspectorApplyToAll = false;
static bool windowTileInspectorElementCopied = false;
static TileElement tileInspectorCopiedElement;
static void WindowTileInspectorMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowTileInspectorMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowTileInspectorResize(rct_window* w);
static void WindowTileInspectorMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowTileInspectorMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowTileInspectorUpdate(rct_window* w);
static void WindowTileInspectorDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowTileInspectorToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowTileInspectorToolUpdate(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorUpdateSelectedTile(rct_window* w, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorToolDown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorToolDrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
static void WindowTileInspectorScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
static void WindowTileInspectorScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
@ -776,7 +776,7 @@ static void WindowTileInspectorClose(rct_window* w)
OpenRCT2::TileInspector::SetSelectedElement(nullptr);
}
static void WindowTileInspectorMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTileInspectorMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -976,7 +976,7 @@ static void WindowTileInspectorResize(rct_window* w)
}
}
static void WindowTileInspectorMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowTileInspectorMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
switch (widgetIndex)
{
@ -1171,7 +1171,7 @@ static void WindowTileInspectorUpdate(rct_window* w)
window_close(*w);
}
static void WindowTileInspectorDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowTileInspectorDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (dropdownIndex == -1)
{
@ -1192,7 +1192,7 @@ static void WindowTileInspectorDropdown(rct_window* w, rct_widgetindex widgetInd
}
}
static void WindowTileInspectorToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTileInspectorToolUpdate(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
map_invalidate_selection_rect();
@ -1288,12 +1288,12 @@ static void WindowTileInspectorUpdateSelectedTile(rct_window* w, const ScreenCoo
WindowTileInspectorLoadTile(w, clickedElement);
}
static void WindowTileInspectorToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTileInspectorToolDown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
WindowTileInspectorUpdateSelectedTile(w, screenCoords);
}
static void WindowTileInspectorToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTileInspectorToolDrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
WindowTileInspectorUpdateSelectedTile(w, screenCoords);
}

4
src/openrct2-ui/windows/TitleExit.cpp
View File

@ -26,7 +26,7 @@ static rct_widget window_title_exit_widgets[] = {
};
static void WindowTitleExitPaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowTitleExitMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTitleExitMouseup(rct_window *w, WidgetIndex widgetIndex);
static rct_window_event_list window_title_exit_events([](auto& events)
{
@ -56,7 +56,7 @@ rct_window* WindowTitleExitOpen()
*
* rct2: 0x0066B83C
*/
static void WindowTitleExitMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleExitMouseup(rct_window* w, WidgetIndex widgetIndex)
{
if (gIntroState != IntroState::None)
return;

4
src/openrct2-ui/windows/TitleLogo.cpp
View File

@ -27,7 +27,7 @@ static rct_widget window_title_logo_widgets[] = {
WIDGETS_END,
};
static void WindowTitleMenuMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowTitleMenuMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowTitleLogoPaint(rct_window* w, rct_drawpixelinfo* dpi);
// clang-format off
@ -55,7 +55,7 @@ rct_window* WindowTitleLogoOpen()
return window;
}
static void WindowTitleMenuMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleMenuMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{

18
src/openrct2-ui/windows/TitleMenu.cpp
View File

@ -55,10 +55,10 @@ static rct_widget window_title_menu_widgets[] = {
WIDGETS_END,
};
static void WindowTitleMenuMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTitleMenuMousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowTitleMenuDropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowTitleMenuCursor(rct_window *w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void WindowTitleMenuMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowTitleMenuMousedown(rct_window *w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowTitleMenuDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowTitleMenuCursor(rct_window *w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
static void WindowTitleMenuInvalidate(rct_window *w);
static void WindowTitleMenuPaint(rct_window *w, rct_drawpixelinfo *dpi);
@ -92,7 +92,7 @@ rct_window* WindowTitleMenuOpen()
window->widgets[WIDX_MULTIPLAYER].type = WindowWidgetType::Empty;
#endif
rct_widgetindex i = 0;
WidgetIndex i = 0;
int32_t x = 0;
for (rct_widget* widget = window->widgets; widget != &window->widgets[WIDX_NEW_VERSION]; widget++)
{
@ -123,7 +123,7 @@ static void WindowTitleMenuScenarioselectCallback(const utf8* path)
game_notify_map_changed();
}
static void WindowTitleMenuMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleMenuMouseup(rct_window* w, WidgetIndex widgetIndex)
{
rct_window* windowToOpen = nullptr;
@ -175,7 +175,7 @@ static void WindowTitleMenuMouseup(rct_window* w, rct_widgetindex widgetIndex)
}
}
static void WindowTitleMenuMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowTitleMenuMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
if (widgetIndex == WIDX_GAME_TOOLS)
{
@ -243,7 +243,7 @@ static void InvokeCustomToolboxMenuItem(size_t index)
#endif
}
static void WindowTitleMenuDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowTitleMenuDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (widgetIndex == WIDX_GAME_TOOLS)
{
@ -277,7 +277,7 @@ static void WindowTitleMenuDropdown(rct_window* w, rct_widgetindex widgetIndex,
}
static void WindowTitleMenuCursor(
rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
{
gTooltipTimeout = 2000;
}

4
src/openrct2-ui/windows/TitleOptions.cpp
View File

@ -24,7 +24,7 @@ static rct_widget window_title_options_widgets[] = {
WIDGETS_END,
};
static void WindowTitleOptionsMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTitleOptionsMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowTitleOptionsPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_title_options_events([](auto& events)
@ -48,7 +48,7 @@ rct_window* WindowTitleOptionsOpen()
return window;
}
static void WindowTitleOptionsMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTitleOptionsMouseup(rct_window* w, WidgetIndex widgetIndex)
{
if (gIntroState != IntroState::None)
return;

2
src/openrct2-ui/windows/Tooltip.cpp
View File

@ -105,7 +105,7 @@ void WindowTooltipShow(const OpenRCT2String& message, ScreenCoordsXY screenCoord
*
* rct2: 0x006EA10D
*/
void WindowTooltipOpen(rct_window* widgetWindow, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCords)
void WindowTooltipOpen(rct_window* widgetWindow, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCords)
{
if (widgetWindow == nullptr || widgetIndex == -1)
return;

54
src/openrct2-ui/windows/TopToolbar.cpp
View File

@ -278,14 +278,14 @@ static rct_widget window_top_toolbar_widgets[] = {
};
// clang-format on
static void WindowTopToolbarMouseup(rct_window* w, rct_widgetindex widgetIndex);
static void WindowTopToolbarMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget);
static void WindowTopToolbarDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
static void WindowTopToolbarToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTopToolbarToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTopToolbarToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTopToolbarToolUp(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoordsy);
static void WindowTopToolbarToolAbort(rct_window* w, rct_widgetindex widgetIndex);
static void WindowTopToolbarMouseup(rct_window* w, WidgetIndex widgetIndex);
static void WindowTopToolbarMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget);
static void WindowTopToolbarDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
static void WindowTopToolbarToolUpdate(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTopToolbarToolDown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTopToolbarToolDrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
static void WindowTopToolbarToolUp(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoordsy);
static void WindowTopToolbarToolAbort(rct_window* w, WidgetIndex widgetIndex);
static void WindowTopToolbarInvalidate(rct_window* w);
static void WindowTopToolbarPaint(rct_window* w, rct_drawpixelinfo* dpi);
@ -318,9 +318,9 @@ static void TopToolbarInitNetworkMenu(rct_window* window, rct_widget* widget);
static void TopToolbarNetworkMenuDropdown(int16_t dropdownIndex);
static void ToggleFootpathWindow();
static void ToggleLandWindow(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void ToggleClearSceneryWindow(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void ToggleWaterWindow(rct_window* topToolbar, rct_widgetindex widgetIndex);
static void ToggleLandWindow(rct_window* topToolbar, WidgetIndex widgetIndex);
static void ToggleClearSceneryWindow(rct_window* topToolbar, WidgetIndex widgetIndex);
static void ToggleWaterWindow(rct_window* topToolbar, WidgetIndex widgetIndex);
static money64 SelectionLowerLand(uint8_t flags);
static money64 SelectionRaiseLand(uint8_t flags);
@ -351,7 +351,7 @@ rct_window* WindowTopToolbarOpen()
*
* rct2: 0x0066C957
*/
static void WindowTopToolbarMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTopToolbarMouseup(rct_window* w, WidgetIndex widgetIndex)
{
rct_window* mainWindow;
@ -435,7 +435,7 @@ static void WindowTopToolbarMouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x0066CA3B
*/
static void WindowTopToolbarMousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget)
static void WindowTopToolbarMousedown(rct_window* w, WidgetIndex widgetIndex, rct_widget* widget)
{
int32_t numItems = 0;
@ -545,7 +545,7 @@ static void WindowTopToolbarScenarioselectCallback(const utf8* path)
*
* rct2: 0x0066C9EA
*/
static void WindowTopToolbarDropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
static void WindowTopToolbarDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
switch (widgetIndex)
{
@ -1014,7 +1014,7 @@ static void WindowTopToolbarPaint(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006E3158
*/
static void RepaintSceneryToolDown(const ScreenCoordsXY& windowPos, rct_widgetindex widgetIndex)
static void RepaintSceneryToolDown(const ScreenCoordsXY& windowPos, WidgetIndex widgetIndex)
{
auto flags = EnumsToFlags(
ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery,
@ -1091,7 +1091,7 @@ static void RepaintSceneryToolDown(const ScreenCoordsXY& windowPos, rct_widgetin
}
}
static void SceneryEyedropperToolDown(const ScreenCoordsXY& windowPos, rct_widgetindex widgetIndex)
static void SceneryEyedropperToolDown(const ScreenCoordsXY& windowPos, WidgetIndex widgetIndex)
{
auto flags = EnumsToFlags(
ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery,
@ -1711,7 +1711,7 @@ static void Sub6E1F34Banner(
*
* rct2: 0x006E2CC6
*/
static void WindowTopToolbarSceneryToolDown(const ScreenCoordsXY& windowPos, rct_window* w, rct_widgetindex widgetIndex)
static void WindowTopToolbarSceneryToolDown(const ScreenCoordsXY& windowPos, rct_window* w, WidgetIndex widgetIndex)
{
scenery_remove_ghost_tool_placement();
if (gWindowSceneryPaintEnabled & 1)
@ -2914,7 +2914,7 @@ static void TopToolbarToolUpdateScenery(const ScreenCoordsXY& screenPos)
*
* rct2: 0x0066CB25
*/
static void WindowTopToolbarToolUpdate(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTopToolbarToolUpdate(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -2949,7 +2949,7 @@ static void WindowTopToolbarToolUpdate(rct_window* w, rct_widgetindex widgetInde
*
* rct2: 0x0066CB73
*/
static void WindowTopToolbarToolDown(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTopToolbarToolDown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -3073,7 +3073,7 @@ static void WindowTopToolbarLandToolDrag(const ScreenCoordsXY& screenPos)
rct_window* window = window_find_from_point(screenPos);
if (window == nullptr)
return;
rct_widgetindex widget_index = window_find_widget_from_point(*window, screenPos);
WidgetIndex widget_index = window_find_widget_from_point(*window, screenPos);
if (widget_index == -1)
return;
const auto& widget = window->widgets[widget_index];
@ -3116,7 +3116,7 @@ static void WindowTopToolbarWaterToolDrag(const ScreenCoordsXY& screenPos)
rct_window* window = window_find_from_point(screenPos);
if (!window)
return;
rct_widgetindex widget_index = window_find_widget_from_point(*window, screenPos);
WidgetIndex widget_index = window_find_widget_from_point(*window, screenPos);
if (widget_index == -1)
return;
const auto& widget = window->widgets[widget_index];
@ -3164,7 +3164,7 @@ static void WindowTopToolbarWaterToolDrag(const ScreenCoordsXY& screenPos)
*
* rct2: 0x0066CB4E
*/
static void WindowTopToolbarToolDrag(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTopToolbarToolDrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
switch (widgetIndex)
{
@ -3229,7 +3229,7 @@ static void WindowTopToolbarToolDrag(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x0066CC5B
*/
static void WindowTopToolbarToolUp(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
static void WindowTopToolbarToolUp(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
_landToolBlocked = false;
switch (widgetIndex)
@ -3265,7 +3265,7 @@ static void WindowTopToolbarToolUp(rct_window* w, rct_widgetindex widgetIndex, c
*
* rct2: 0x0066CA58
*/
static void WindowTopToolbarToolAbort(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTopToolbarToolAbort(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -3809,7 +3809,7 @@ static void ToggleFootpathWindow()
*
* rct2: 0x0066CD54
*/
static void ToggleLandWindow(rct_window* topToolbar, rct_widgetindex widgetIndex)
static void ToggleLandWindow(rct_window* topToolbar, WidgetIndex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WindowClass::TopToolbar
&& gCurrentToolWidget.widget_index == WIDX_LAND)
@ -3830,7 +3830,7 @@ static void ToggleLandWindow(rct_window* topToolbar, rct_widgetindex widgetIndex
*
* rct2: 0x0066CD0C
*/
static void ToggleClearSceneryWindow(rct_window* topToolbar, rct_widgetindex widgetIndex)
static void ToggleClearSceneryWindow(rct_window* topToolbar, WidgetIndex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == WindowClass::TopToolbar
&& gCurrentToolWidget.widget_index == WIDX_CLEAR_SCENERY))
@ -3850,7 +3850,7 @@ static void ToggleClearSceneryWindow(rct_window* topToolbar, rct_widgetindex wid
*
* rct2: 0x0066CD9C
*/
static void ToggleWaterWindow(rct_window* topToolbar, rct_widgetindex widgetIndex)
static void ToggleWaterWindow(rct_window* topToolbar, WidgetIndex widgetIndex)
{
if ((input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WindowClass::TopToolbar
&& gCurrentToolWidget.widget_index == WIDX_WATER)

12
src/openrct2-ui/windows/TrackDesignManage.cpp
View File

@ -57,11 +57,11 @@ static rct_widget window_track_delete_prompt_widgets[] = {
#pragma region Events
static void WindowTrackManageClose(rct_window *w);
static void WindowTrackManageMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTrackManageTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowTrackManageMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowTrackManageTextinput(rct_window *w, WidgetIndex widgetIndex, char *text);
static void WindowTrackManagePaint(rct_window *w, rct_drawpixelinfo *dpi);
static void WindowTrackDeletePromptMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowTrackDeletePromptMouseup(rct_window *w, WidgetIndex widgetIndex);
static void WindowTrackDeletePromptPaint(rct_window *w, rct_drawpixelinfo *dpi);
// 0x009940EC
@ -129,7 +129,7 @@ static void WindowTrackManageClose(rct_window* w)
*
* rct2: 0x006D3523
*/
static void WindowTrackManageMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTrackManageMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{
@ -152,7 +152,7 @@ static void WindowTrackManageMouseup(rct_window* w, rct_widgetindex widgetIndex)
*
* rct2: 0x006D3523
*/
static void WindowTrackManageTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
static void WindowTrackManageTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if (widgetIndex != WIDX_RENAME || str_is_null_or_empty(text))
{
@ -217,7 +217,7 @@ static void WindowTrackDeletePromptOpen()
*
* rct2: 0x006D3823
*/
static void WindowTrackDeletePromptMouseup(rct_window* w, rct_widgetindex widgetIndex)
static void WindowTrackDeletePromptMouseup(rct_window* w, WidgetIndex widgetIndex)
{
switch (widgetIndex)
{

8
src/openrct2-ui/windows/TrackDesignPlace.cpp
View File

@ -102,7 +102,7 @@ public:
_trackDesign = nullptr;
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -141,7 +141,7 @@ public:
Close();
}
void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
TrackDesignState tds{};
int16_t mapZ;
@ -206,7 +206,7 @@ public:
TrackDesignPreviewDrawOutlines(tds, _trackDesign.get(), GetOrAllocateRide(PreviewRideId), trackLoc);
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
ClearProvisional();
map_invalidate_map_selection_tiles();
@ -269,7 +269,7 @@ public:
windowManager->ShowError(res.GetErrorTitle(), res.GetErrorMessage());
}
void OnToolAbort(rct_widgetindex widgetIndex) override
void OnToolAbort(WidgetIndex widgetIndex) override
{
ClearProvisional();
}

4
src/openrct2-ui/windows/TrackList.cpp
View File

@ -255,7 +255,7 @@ public:
}
}
void OnMouseUp(const rct_widgetindex widgetIndex) override
void OnMouseUp(const WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -343,7 +343,7 @@ public:
}
}
void OnTextInput(const rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(const WidgetIndex widgetIndex, std::string_view text) override
{
if (widgetIndex != WIDX_FILTER_STRING || text.empty())
return;

6
src/openrct2-ui/windows/Transparency.cpp
View File

@ -100,7 +100,7 @@ public:
windowPos.x = ((w->width / 2) - (width / 2));
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -139,7 +139,7 @@ public:
SetWidgetPressed(WIDX_INVISIBLE_VEHICLES, (wflags & VIEWPORT_FLAG_INVISIBLE_VEHICLES));
SetWidgetPressed(WIDX_INVISIBLE_SUPPORTS, (wflags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS));
for (rct_widgetindex i = WIDX_INVISIBLE_VEGETATION; i <= WIDX_INVISIBLE_SUPPORTS; i++)
for (WidgetIndex i = WIDX_INVISIBLE_VEGETATION; i <= WIDX_INVISIBLE_SUPPORTS; i++)
{
widgets[i].image = IsWidgetPressed(i) ? SPR_G2_BUTTON_HIDE_FULL : SPR_G2_BUTTON_HIDE_PARTIAL;
}
@ -167,7 +167,7 @@ private:
return wflags;
}
void ToggleViewportFlag(rct_widgetindex widgetIndex)
void ToggleViewportFlag(WidgetIndex widgetIndex)
{
uint32_t wflags = 0;
rct_window* w = window_get_main();

12
src/openrct2-ui/windows/ViewClipping.cpp
View File

@ -80,7 +80,7 @@ public:
OnClose();
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
// mouseup appears to be used for buttons, checkboxes
switch (widgetIndex)
@ -138,7 +138,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
rct_window* mainWindow;
@ -191,7 +191,7 @@ public:
widget_invalidate(*this, WIDX_CLIP_HEIGHT_SLIDER);
}
void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
if (_dragging)
{
@ -210,7 +210,7 @@ public:
}
}
void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
int32_t direction;
auto mapCoords = screen_pos_to_map_pos(screenCoords, &direction);
@ -221,7 +221,7 @@ public:
}
}
void OnToolDrag(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords) override
void OnToolDrag(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override
{
if (!_dragging)
{
@ -243,7 +243,7 @@ public:
}
}
void OnToolUp(rct_widgetindex, const ScreenCoordsXY&) override
void OnToolUp(WidgetIndex, const ScreenCoordsXY&) override
{
gClipSelectionA = gMapSelectPositionA;
gClipSelectionB = gMapSelectPositionB;

2
src/openrct2-ui/windows/Viewport.cpp
View File

@ -117,7 +117,7 @@ public:
// widget_invalidate(*this, WIDX_VIEWPORT);
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{

6
src/openrct2-ui/windows/Water.cpp
View File

@ -64,7 +64,7 @@ public:
}
}
void OnMouseUp(rct_widgetindex widgetIndex) override
void OnMouseUp(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -77,7 +77,7 @@ public:
}
}
void OnMouseDown(rct_widgetindex widgetIndex) override
void OnMouseDown(WidgetIndex widgetIndex) override
{
switch (widgetIndex)
{
@ -107,7 +107,7 @@ public:
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
void OnTextInput(WidgetIndex widgetIndex, std::string_view text) override
{
int32_t size;
char* end;

10
src/openrct2-ui/windows/Window.h
View File

@ -118,8 +118,8 @@ rct_window* WindowMapOpen();
void WindowMapReset();
rct_window* WindowResearchOpen();
void WindowResearchDevelopmentPagePaint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex);
void WindowResearchFundingPagePaint(rct_window* w, rct_drawpixelinfo* dpi, rct_widgetindex baseWidgetIndex);
void WindowResearchDevelopmentPagePaint(rct_window* w, rct_drawpixelinfo* dpi, WidgetIndex baseWidgetIndex);
void WindowResearchFundingPagePaint(rct_window* w, rct_drawpixelinfo* dpi, WidgetIndex baseWidgetIndex);
rct_window* WindowNewRideOpen();
rct_window* WindowNewRideOpenResearch();
@ -151,10 +151,10 @@ void WindowNetworkStatusClose();
void WindowTextInputKey(rct_window* w, char keychar);
void WindowTextInputOpen(
rct_window* call_w, rct_widgetindex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
rct_window* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
StringId existing_text, uintptr_t existing_args, int32_t maxLength);
void WindowTextInputRawOpen(
rct_window* call_w, rct_widgetindex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
rct_window* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
const_utf8string existing_text, int32_t maxLength);
void WindowTextInputOpen(
@ -195,7 +195,7 @@ rct_window* WindowEditorObjectSelectionOpen();
void WindowTooltipReset(const ScreenCoordsXY& screenCoords);
void WindowTooltipShow(const OpenRCT2String& message, ScreenCoordsXY screenCoords);
void WindowTooltipOpen(rct_window* widgetWindow, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
void WindowTooltipOpen(rct_window* widgetWindow, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
void WindowTooltipClose();
rct_window* WindowSceneryScatterOpen();

4
src/openrct2/Input.h
View File

@ -70,7 +70,7 @@ struct widget_ref
{
WindowClass window_classification;
rct_windownumber window_number;
rct_widgetindex widget_index;
WidgetIndex widget_index;
};
extern uint8_t gInputPlaceObjectModifier;
@ -92,7 +92,7 @@ extern InputState _inputState;
extern uint8_t _inputFlags;
extern uint16_t _tooltipNotShownTicks;
void InputWindowPositionBegin(rct_window& w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
void InputWindowPositionBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
void title_handle_keyboard_input();
void GameHandleInput();

28
src/openrct2/interface/Widget.h
View File

@ -144,22 +144,22 @@ constexpr rct_widget MakeDropdownButtonWidget(
return MakeWidget({ xPos, yPos }, { width, height }, WindowWidgetType::Button, colour, STR_DROPDOWN_GLYPH, tooltip);
}
void WidgetScrollUpdateThumbs(rct_window& w, rct_widgetindex widget_index);
void WidgetDraw(rct_drawpixelinfo* dpi, rct_window& w, rct_widgetindex widgetIndex);
void WidgetScrollUpdateThumbs(rct_window& w, WidgetIndex widget_index);
void WidgetDraw(rct_drawpixelinfo* dpi, rct_window& w, WidgetIndex widgetIndex);
bool WidgetIsDisabled(const rct_window& w, rct_widgetindex widgetIndex);
bool WidgetIsHoldable(const rct_window& w, rct_widgetindex widgetIndex);
bool WidgetIsVisible(const rct_window& w, rct_widgetindex widgetIndex);
bool WidgetIsPressed(const rct_window& w, rct_widgetindex widgetIndex);
bool WidgetIsHighlighted(const rct_window& w, rct_widgetindex widgetIndex);
bool WidgetIsActiveTool(const rct_window& w, rct_widgetindex widgetIndex);
bool WidgetIsDisabled(const rct_window& w, WidgetIndex widgetIndex);
bool WidgetIsHoldable(const rct_window& w, WidgetIndex widgetIndex);
bool WidgetIsVisible(const rct_window& w, WidgetIndex widgetIndex);
bool WidgetIsPressed(const rct_window& w, WidgetIndex widgetIndex);
bool WidgetIsHighlighted(const rct_window& w, WidgetIndex widgetIndex);
bool WidgetIsActiveTool(const rct_window& w, WidgetIndex widgetIndex);
void WidgetScrollGetPart(
rct_window& w, const rct_widget* widget, const ScreenCoordsXY& screenCoords, ScreenCoordsXY& retScreenCoords,
int32_t* output_scroll_area, int32_t* scroll_id);
void WidgetSetEnabled(rct_window& w, rct_widgetindex widgetIndex, bool enabled);
void WidgetSetDisabled(rct_window& w, rct_widgetindex widgetIndex, bool value);
void WidgetSetHoldable(rct_window& w, rct_widgetindex widgetIndex, bool value);
void WidgetSetVisible(rct_window& w, rct_widgetindex widgetIndex, bool value);
void WidgetSetPressed(rct_window& w, rct_widgetindex widgetIndex, bool value);
void WidgetSetCheckboxValue(rct_window& w, rct_widgetindex widgetIndex, bool value);
void WidgetSetEnabled(rct_window& w, WidgetIndex widgetIndex, bool enabled);
void WidgetSetDisabled(rct_window& w, WidgetIndex widgetIndex, bool value);
void WidgetSetHoldable(rct_window& w, WidgetIndex widgetIndex, bool value);
void WidgetSetVisible(rct_window& w, WidgetIndex widgetIndex, bool value);
void WidgetSetPressed(rct_window& w, WidgetIndex widgetIndex, bool value);
void WidgetSetCheckboxValue(rct_window& w, WidgetIndex widgetIndex, bool value);

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

@ -430,13 +430,13 @@ rct_window* window_find_from_point(const ScreenCoordsXY& screenCoords)
* returns widget_index (edx)
* EDI NEEDS TO BE SET TO w->widgets[widget_index] AFTER
*/
rct_widgetindex window_find_widget_from_point(rct_window& w, const ScreenCoordsXY& screenCoords)
WidgetIndex window_find_widget_from_point(rct_window& w, const ScreenCoordsXY& screenCoords)
{
// Invalidate the window
window_event_invalidate_call(&w);
// Find the widget at point x, y
rct_widgetindex widget_index = -1;
WidgetIndex widget_index = -1;
for (int32_t i = 0;; i++)
{
const auto& widget = w.widgets[i];
@ -521,7 +521,7 @@ void window_invalidate_all()
* Invalidates the specified widget of a window.
* rct2: 0x006EC402
*/
void widget_invalidate(rct_window& w, rct_widgetindex widgetIndex)
void widget_invalidate(rct_window& w, WidgetIndex widgetIndex)
{
#ifdef DEBUG
for (int32_t i = 0; i <= widgetIndex; i++)
@ -551,7 +551,7 @@ template<typename TPred> static void widget_invalidate_by_condition(TPred pred)
/**
* Invalidates the specified widget of all windows that match the specified window class.
*/
void widget_invalidate_by_class(WindowClass cls, rct_widgetindex widgetIndex)
void widget_invalidate_by_class(WindowClass cls, WidgetIndex widgetIndex)
{
window_visit_each([cls, widgetIndex](rct_window* w) {
if (w->classification == cls)
@ -565,7 +565,7 @@ void widget_invalidate_by_class(WindowClass cls, rct_widgetindex widgetIndex)
* Invalidates the specified widget of all windows that match the specified window class and number.
* rct2: 0x006EC3AC
*/
void widget_invalidate_by_number(WindowClass cls, rct_windownumber number, rct_widgetindex widgetIndex)
void widget_invalidate_by_number(WindowClass cls, rct_windownumber number, WidgetIndex widgetIndex)
{
window_visit_each([cls, number, widgetIndex](rct_window* w) {
if (w->classification == cls && w->number == number)
@ -584,7 +584,7 @@ void widget_invalidate_by_number(WindowClass cls, rct_windownumber number, rct_w
void window_update_scroll_widgets(rct_window& w)
{
int32_t scrollIndex, width, height, scrollPositionChanged;
rct_widgetindex widgetIndex;
WidgetIndex widgetIndex;
rct_widget* widget;
widgetIndex = 0;
@ -631,7 +631,7 @@ void window_update_scroll_widgets(rct_window& w)
}
}
int32_t window_get_scroll_data_index(const rct_window& w, rct_widgetindex widget_index)
int32_t window_get_scroll_data_index(const rct_window& w, WidgetIndex widget_index)
{
int32_t i, result;
@ -1348,7 +1348,7 @@ void window_set_resize(rct_window& w, int32_t minWidth, int32_t minHeight, int32
* @param widgetIndex (dx)
* @param w (esi)
*/
bool tool_set(const rct_window& w, rct_widgetindex widgetIndex, Tool tool)
bool tool_set(const rct_window& w, WidgetIndex widgetIndex, Tool tool)
{
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
{
@ -1409,7 +1409,7 @@ void window_event_close_call(rct_window* w)
w->event_handlers->close(w);
}
void window_event_mouse_up_call(rct_window* w, rct_widgetindex widgetIndex)
void window_event_mouse_up_call(rct_window* w, WidgetIndex widgetIndex)
{
if (w->event_handlers == nullptr)
w->OnMouseUp(widgetIndex);
@ -1425,7 +1425,7 @@ void window_event_resize_call(rct_window* w)
w->event_handlers->resize(w);
}
void window_event_mouse_down_call(rct_window* w, rct_widgetindex widgetIndex)
void window_event_mouse_down_call(rct_window* w, WidgetIndex widgetIndex)
{
if (w->event_handlers == nullptr)
w->OnMouseDown(widgetIndex);
@ -1433,7 +1433,7 @@ void window_event_mouse_down_call(rct_window* w, rct_widgetindex widgetIndex)
w->event_handlers->mouse_down(w, widgetIndex, &w->widgets[widgetIndex]);
}
void window_event_dropdown_call(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
void window_event_dropdown_call(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
{
if (w->event_handlers == nullptr)
{
@ -1478,7 +1478,7 @@ void window_event_unknown_08_call(rct_window* w)
w->event_handlers->unknown_08(w);
}
void window_event_tool_update_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void window_event_tool_update_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (w->event_handlers == nullptr)
w->OnToolUpdate(widgetIndex, screenCoords);
@ -1486,7 +1486,7 @@ void window_event_tool_update_call(rct_window* w, rct_widgetindex widgetIndex, c
w->event_handlers->tool_update(w, widgetIndex, screenCoords);
}
void window_event_tool_down_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void window_event_tool_down_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (w->event_handlers == nullptr)
w->OnToolDown(widgetIndex, screenCoords);
@ -1494,7 +1494,7 @@ void window_event_tool_down_call(rct_window* w, rct_widgetindex widgetIndex, con
w->event_handlers->tool_down(w, widgetIndex, screenCoords);
}
void window_event_tool_drag_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void window_event_tool_drag_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (w->event_handlers == nullptr)
w->OnToolDrag(widgetIndex, screenCoords);
@ -1502,7 +1502,7 @@ void window_event_tool_drag_call(rct_window* w, rct_widgetindex widgetIndex, con
w->event_handlers->tool_drag(w, widgetIndex, screenCoords);
}
void window_event_tool_up_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
void window_event_tool_up_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
if (w->event_handlers == nullptr)
w->OnToolUp(widgetIndex, screenCoords);
@ -1510,7 +1510,7 @@ void window_event_tool_up_call(rct_window* w, rct_widgetindex widgetIndex, const
w->event_handlers->tool_up(w, widgetIndex, screenCoords);
}
void window_event_tool_abort_call(rct_window* w, rct_widgetindex widgetIndex)
void window_event_tool_abort_call(rct_window* w, WidgetIndex widgetIndex)
{
if (w->event_handlers == nullptr)
w->OnToolAbort(widgetIndex);
@ -1565,7 +1565,7 @@ void window_event_scroll_mouseover_call(rct_window* w, int32_t scrollIndex, cons
w->event_handlers->scroll_mouseover(w, scrollIndex, screenCoords);
}
void window_event_textinput_call(rct_window* w, rct_widgetindex widgetIndex, char* text)
void window_event_textinput_call(rct_window* w, WidgetIndex widgetIndex, char* text)
{
if (w->event_handlers == nullptr)
{
@ -1596,7 +1596,7 @@ void window_event_unknown_15_call(rct_window* w, int32_t scrollIndex, int32_t sc
w->event_handlers->unknown_15(w, scrollIndex, scrollAreaType);
}
OpenRCT2String window_event_tooltip_call(rct_window* w, const rct_widgetindex widgetIndex, const StringId fallback)
OpenRCT2String window_event_tooltip_call(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback)
{
if (w->event_handlers == nullptr)
{
@ -1611,7 +1611,7 @@ OpenRCT2String window_event_tooltip_call(rct_window* w, const rct_widgetindex wi
return { fallback, {} };
}
CursorID window_event_cursor_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
CursorID window_event_cursor_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
CursorID cursorId = CursorID::Arrow;
if (w->event_handlers == nullptr)
@ -1968,7 +1968,7 @@ void textinput_cancel()
}
void window_start_textbox(
rct_window& call_w, rct_widgetindex call_widget, StringId existing_text, char* existing_args, int32_t maxLength)
rct_window& call_w, WidgetIndex call_widget, StringId existing_text, char* existing_args, int32_t maxLength)
{
if (gUsingWidgetTextBox)
window_cancel_textbox();
@ -2187,7 +2187,7 @@ WindowClass window_get_classification(const rct_window& window)
*
* rct2: 0x006EAF26
*/
void WidgetScrollUpdateThumbs(rct_window& w, rct_widgetindex widget_index)
void WidgetScrollUpdateThumbs(rct_window& w, WidgetIndex widget_index)
{
const auto& widget = w.widgets[widget_index];
auto& scroll = w.scrolls[window_get_scroll_data_index(w, widget_index)];

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

@ -52,7 +52,7 @@ extern struct TextInputSession* gTextInput;
using wndproc = void(struct rct_window*, union rct_window_event*);
using rct_windownumber = uint16_t;
using rct_widgetindex = int16_t;
using WidgetIndex = int16_t;
struct window_identifier
{
@ -63,7 +63,7 @@ struct window_identifier
struct widget_identifier
{
window_identifier window;
rct_widgetindex widget_index;
WidgetIndex widget_index;
};
extern widget_identifier gCurrentTextBox;
@ -227,29 +227,29 @@ struct Focus
struct rct_window_event_list
{
void (*close)(struct rct_window*){};
void (*mouse_up)(struct rct_window*, rct_widgetindex){};
void (*mouse_up)(struct rct_window*, WidgetIndex){};
void (*resize)(struct rct_window*){};
void (*mouse_down)(struct rct_window*, rct_widgetindex, rct_widget*){};
void (*dropdown)(struct rct_window*, rct_widgetindex, int32_t){};
void (*mouse_down)(struct rct_window*, WidgetIndex, rct_widget*){};
void (*dropdown)(struct rct_window*, WidgetIndex, int32_t){};
void (*unknown_05)(struct rct_window*){};
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, const ScreenCoordsXY&){};
void (*tool_down)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&){};
void (*tool_drag)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&){};
void (*tool_up)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&){};
void (*tool_abort)(struct rct_window*, rct_widgetindex){};
void (*tool_update)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){};
void (*tool_down)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){};
void (*tool_drag)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){};
void (*tool_up)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){};
void (*tool_abort)(struct rct_window*, WidgetIndex){};
void (*unknown_0E)(struct rct_window*){};
void (*get_scroll_size)(struct rct_window*, int32_t, int32_t*, int32_t*){};
void (*scroll_mousedown)(struct rct_window*, int32_t, const ScreenCoordsXY&){};
void (*scroll_mousedrag)(struct rct_window*, int32_t, const ScreenCoordsXY&){};
void (*scroll_mouseover)(struct rct_window*, int32_t, const ScreenCoordsXY&){};
void (*text_input)(struct rct_window*, rct_widgetindex, char*){};
void (*text_input)(struct rct_window*, WidgetIndex, char*){};
void (*viewport_rotate)(struct rct_window*){};
void (*unknown_15)(struct rct_window*, int32_t, int32_t){};
OpenRCT2String (*tooltip)(struct rct_window*, const rct_widgetindex, const StringId){};
void (*cursor)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&, CursorID*){};
OpenRCT2String (*tooltip)(struct rct_window*, const WidgetIndex, const StringId){};
void (*cursor)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&, CursorID*){};
void (*moved)(struct rct_window*, const ScreenCoordsXY&){};
void (*invalidate)(struct rct_window*){};
void (*paint)(struct rct_window*, rct_drawpixelinfo*){};
@ -618,17 +618,17 @@ rct_window* window_find_by_class(WindowClass cls);
rct_window* window_find_by_number(WindowClass cls, rct_windownumber number);
rct_window* window_find_by_number(WindowClass cls, EntityId id);
rct_window* window_find_from_point(const ScreenCoordsXY& screenCoords);
rct_widgetindex window_find_widget_from_point(rct_window& w, const ScreenCoordsXY& screenCoords);
WidgetIndex window_find_widget_from_point(rct_window& w, const ScreenCoordsXY& screenCoords);
void window_invalidate_by_class(WindowClass cls);
void window_invalidate_by_number(WindowClass cls, rct_windownumber number);
void window_invalidate_by_number(WindowClass cls, EntityId id);
void window_invalidate_all();
void widget_invalidate(rct_window& w, rct_widgetindex widgetIndex);
void widget_invalidate_by_class(WindowClass cls, rct_widgetindex widgetIndex);
void widget_invalidate_by_number(WindowClass cls, rct_windownumber number, rct_widgetindex widgetIndex);
void widget_invalidate(rct_window& w, WidgetIndex widgetIndex);
void widget_invalidate_by_class(WindowClass cls, WidgetIndex widgetIndex);
void widget_invalidate_by_number(WindowClass cls, rct_windownumber number, WidgetIndex widgetIndex);
void WindowInitScrollWidgets(rct_window& w);
void window_update_scroll_widgets(rct_window& w);
int32_t window_get_scroll_data_index(const rct_window& w, rct_widgetindex widget_index);
int32_t window_get_scroll_data_index(const rct_window& w, WidgetIndex widget_index);
void window_push_others_right(rct_window& w);
void window_push_others_below(rct_window& w1);
@ -656,7 +656,7 @@ void window_move_position(rct_window& w, const ScreenCoordsXY& screenCoords);
void window_resize(rct_window& w, int32_t dw, int32_t dh);
void window_set_resize(rct_window& w, int32_t minWidth, int32_t minHeight, int32_t maxWidth, int32_t maxHeight);
bool tool_set(const rct_window& w, rct_widgetindex widgetIndex, Tool tool);
bool tool_set(const rct_window& w, WidgetIndex widgetIndex, Tool tool);
void tool_cancel();
void window_close_construction_windows();
@ -674,29 +674,29 @@ void ride_construction_toolupdate_construct(const ScreenCoordsXY& screenCoords);
void ride_construction_tooldown_construct(const ScreenCoordsXY& screenCoords);
void window_event_close_call(rct_window* w);
void window_event_mouse_up_call(rct_window* w, rct_widgetindex widgetIndex);
void window_event_mouse_up_call(rct_window* w, WidgetIndex widgetIndex);
void window_event_resize_call(rct_window* w);
void window_event_mouse_down_call(rct_window* w, rct_widgetindex widgetIndex);
void window_event_dropdown_call(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex);
void window_event_mouse_down_call(rct_window* w, WidgetIndex widgetIndex);
void window_event_dropdown_call(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
void window_event_unknown_05_call(rct_window* w);
void window_event_update_call(rct_window* w);
void window_event_periodic_update_call(rct_window* w);
void window_event_unknown_08_call(rct_window* w);
void window_event_tool_update_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_event_tool_down_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_event_tool_drag_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_event_tool_up_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_event_tool_abort_call(rct_window* w, rct_widgetindex widgetIndex);
void window_event_tool_update_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_event_tool_down_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_event_tool_drag_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_event_tool_up_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_event_tool_abort_call(rct_window* w, WidgetIndex widgetIndex);
void window_event_unknown_0E_call(rct_window* w);
void window_get_scroll_size(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
void window_event_scroll_mousedown_call(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
void window_event_scroll_mousedrag_call(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
void window_event_scroll_mouseover_call(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
void window_event_textinput_call(rct_window* w, rct_widgetindex widgetIndex, char* text);
void window_event_textinput_call(rct_window* w, WidgetIndex widgetIndex, char* text);
void window_event_viewport_rotate_call(rct_window* w);
void window_event_unknown_15_call(rct_window* w, int32_t scrollIndex, int32_t scrollAreaType);
OpenRCT2String window_event_tooltip_call(rct_window* w, const rct_widgetindex widgetIndex, const StringId fallback);
CursorID window_event_cursor_call(rct_window* w, rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords);
OpenRCT2String window_event_tooltip_call(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback);
CursorID window_event_cursor_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
void window_event_moved_call(rct_window* w, const ScreenCoordsXY& screenCoords);
void window_event_invalidate_call(rct_window* w);
void window_event_paint_call(rct_window* w, rct_drawpixelinfo* dpi);
@ -709,7 +709,7 @@ void window_move_and_snap(rct_window& w, ScreenCoordsXY newWindowCoords, int32_t
int32_t window_can_resize(const rct_window& w);
void window_start_textbox(
rct_window& call_w, rct_widgetindex call_widget, StringId existing_text, char* existing_args, int32_t maxLength);
rct_window& call_w, WidgetIndex call_widget, StringId existing_text, char* existing_args, int32_t maxLength);
void window_cancel_textbox();
void window_update_textbox_caret();
void window_update_textbox();

2
src/openrct2/interface/Window_internal.cpp
View File

@ -37,7 +37,7 @@ void rct_window::RemoveViewport()
viewport = nullptr;
}
CursorID rct_window::OnCursor(rct_widgetindex, const ScreenCoordsXY&, CursorID)
CursorID rct_window::OnCursor(WidgetIndex, const ScreenCoordsXY&, CursorID)
{
return CursorID::Arrow;
}

24
src/openrct2/interface/Window_internal.h
View File

@ -134,23 +134,23 @@ struct rct_window
virtual void OnDraw(rct_drawpixelinfo& dpi)
{
}
virtual void OnDrawWidget(rct_widgetindex widgetIndex, rct_drawpixelinfo& dpi)
virtual void OnDrawWidget(WidgetIndex widgetIndex, rct_drawpixelinfo& dpi)
{
}
virtual OpenRCT2String OnTooltip(rct_widgetindex widgetIndex, StringId fallback)
virtual OpenRCT2String OnTooltip(WidgetIndex widgetIndex, StringId fallback)
{
return { fallback, {} };
}
virtual void OnMouseDown(rct_widgetindex widgetIndex)
virtual void OnMouseDown(WidgetIndex widgetIndex)
{
}
virtual void OnMouseUp(rct_widgetindex widgetIndex)
virtual void OnMouseUp(WidgetIndex widgetIndex)
{
}
virtual void OnDropdown(rct_widgetindex widgetIndex, int32_t selectedIndex)
virtual void OnDropdown(WidgetIndex widgetIndex, int32_t selectedIndex)
{
}
virtual void OnTextInput(rct_widgetindex widgetIndex, std::string_view text)
virtual void OnTextInput(WidgetIndex widgetIndex, std::string_view text)
{
}
virtual ScreenSize OnScrollGetSize(int32_t scrollIndex)
@ -169,19 +169,19 @@ struct rct_window
virtual void OnScrollDraw(int32_t scrollIndex, rct_drawpixelinfo& dpi)
{
}
virtual void OnToolUpdate(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
virtual void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
}
virtual void OnToolDown(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
virtual void OnToolDown(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
}
virtual void OnToolDrag(rct_widgetindex widgetIndex, const ScreenCoordsXY& screenCoords)
virtual void OnToolDrag(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
{
}
virtual void OnToolUp(rct_widgetindex, const ScreenCoordsXY&)
virtual void OnToolUp(WidgetIndex, const ScreenCoordsXY&)
{
}
virtual void OnToolAbort(rct_widgetindex widgetIndex)
virtual void OnToolAbort(WidgetIndex widgetIndex)
{
}
virtual void OnViewportRotate()
@ -190,7 +190,7 @@ struct rct_window
virtual void OnMoved(const ScreenCoordsXY&)
{
}
virtual CursorID OnCursor(rct_widgetindex, const ScreenCoordsXY&, CursorID);
virtual CursorID OnCursor(WidgetIndex, const ScreenCoordsXY&, CursorID);
};
#ifdef __WARN_SUGGEST_FINAL_METHODS__

2
src/openrct2/windows/_legacy.cpp
View File

@ -407,7 +407,7 @@ void window_ride_construction_update_active_elements()
bool scenery_tool_is_active()
{
auto toolWindowClassification = gCurrentToolWidget.window_classification;
rct_widgetindex toolWidgetIndex = gCurrentToolWidget.widget_index;
WidgetIndex toolWidgetIndex = gCurrentToolWidget.widget_index;
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
if (toolWindowClassification == WindowClass::TopToolbar && toolWidgetIndex == WC_TOP_TOOLBAR__WIDX_SCENERY)
return true;