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

Close #13625: Refactor TOOL_IDX to use strong enum

Browse Source
This commit is contained in:
Tulio Leao
2020-12-23 01:11:15 -03:00
parent d6ebdded6b
commit 00483df2f2
22 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1331,7 +1331,7 @@ void window_set_resize(rct_window* w, int32_t minWidth, int32_t minHeight, int32
* @param widgetIndex (dx)
* @param w (esi)
*/
bool tool_set(rct_window* w, rct_widgetindex widgetIndex, TOOL_IDX tool)
bool tool_set(rct_window* w, rct_widgetindex widgetIndex, Tool tool)
{
if (input_test_flag(INPUT_FLAG_TOOL_ACTIVE))
{

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

@@ -632,19 +632,19 @@ enum class GuestListFilterType : int32_t
GuestsThinkingX,
};
enum TOOL_IDX
enum class Tool
{
TOOL_ARROW = 0,
TOOL_UP_ARROW = 2,
TOOL_UP_DOWN_ARROW = 3,
TOOL_PICKER = 7,
TOOL_CROSSHAIR = 12,
TOOL_PATH_DOWN = 17,
TOOL_DIG_DOWN = 18,
TOOL_WATER_DOWN = 19,
TOOL_WALK_DOWN = 22,
TOOL_PAINT_DOWN = 23,
TOOL_ENTRANCE_DOWN = 24,
Arrow = 0,
UpArrow = 2,
UpDownArrow = 3,
Picker = 7,
Crosshair = 12,
PathDown = 17,
DigDown = 18,
WaterDown = 19,
WalkDown = 22,
PaintDown = 23,
EntranceDown = 24,
};
using modal_callback = void (*)(int32_t result);
@@ -733,7 +733,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(rct_window* w, rct_widgetindex widgetIndex, TOOL_IDX tool);
bool tool_set(rct_window* w, rct_widgetindex widgetIndex, Tool tool);
void tool_cancel();
void window_close_construction_windows();