diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 5310fc0d33..c3d236d605 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -332,7 +332,7 @@ namespace OpenRCT2::Ui::Windows { auto action = GetClearAction(); GameActions::Execute(&action); - gCurrentToolId = Tool::Bulldozer; + gCurrentToolId = Tool::bulldozer; } break; } @@ -349,7 +349,7 @@ namespace OpenRCT2::Ui::Windows { auto action = GetClearAction(); GameActions::Execute(&action); - gCurrentToolId = Tool::Bulldozer; + gCurrentToolId = Tool::bulldozer; } break; } @@ -363,7 +363,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_BACKGROUND: MapInvalidateSelectionRect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; - gCurrentToolId = Tool::Bulldozer; + gCurrentToolId = Tool::bulldozer; break; } } @@ -400,7 +400,7 @@ namespace OpenRCT2::Ui::Windows { ShowGridlines(); auto* toolWindow = ContextOpenWindow(WindowClass::ClearScenery); - ToolSet(*toolWindow, WIDX_BACKGROUND, Tool::Bulldozer); + ToolSet(*toolWindow, WIDX_BACKGROUND, Tool::bulldozer); InputSetFlag(INPUT_FLAG_6, true); } } diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp index 87c39574ed..eb70931a32 100644 --- a/src/openrct2-ui/windows/EditorParkEntrance.cpp +++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp @@ -253,7 +253,7 @@ namespace OpenRCT2::Ui::Windows pressed_widgets |= 1LL << WIDX_TAB; - ToolSet(*this, WIDX_LIST, Tool::EntranceDown); + ToolSet(*this, WIDX_LIST, Tool::entranceDown); InputSetFlag(INPUT_FLAG_6, true); } diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 4e8fbcc780..d9200c49ee 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -221,7 +221,7 @@ namespace OpenRCT2::Ui::Windows ToolCancel(); _footpathConstructionMode = PATH_CONSTRUCTION_MODE_LAND; - ToolSet(*this, WIDX_CONSTRUCT_ON_LAND, Tool::PathDown); + ToolSet(*this, WIDX_CONSTRUCT_ON_LAND, Tool::pathDown); InputSetFlag(INPUT_FLAG_6, true); _footpathErrorOccured = false; WindowFootpathSetEnabledAndPressedWidgets(); @@ -332,7 +332,7 @@ namespace OpenRCT2::Ui::Windows MapInvalidateMapSelectionTiles(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT; _footpathConstructionMode = PATH_CONSTRUCTION_MODE_LAND; - ToolSet(*this, WIDX_CONSTRUCT_ON_LAND, Tool::PathDown); + ToolSet(*this, WIDX_CONSTRUCT_ON_LAND, Tool::pathDown); InputSetFlag(INPUT_FLAG_6, true); _footpathErrorOccured = false; WindowFootpathSetEnabledAndPressedWidgets(); @@ -349,7 +349,7 @@ namespace OpenRCT2::Ui::Windows MapInvalidateMapSelectionTiles(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT; _footpathConstructionMode = PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL_TOOL; - ToolSet(*this, WIDX_CONSTRUCT_BRIDGE_OR_TUNNEL, Tool::Crosshair); + ToolSet(*this, WIDX_CONSTRUCT_BRIDGE_OR_TUNNEL, Tool::crosshair); InputSetFlag(INPUT_FLAG_6, true); _footpathErrorOccured = false; WindowFootpathSetEnabledAndPressedWidgets(); diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 91c58dc090..d3b240eeb5 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -641,7 +641,7 @@ namespace OpenRCT2::Ui::Windows WindowBase* wind = windowMgr->FindByNumber(WindowClass::Peep, peepnum); if (wind != nullptr) { - ToolSet(*wind, WC_PEEP__WIDX_PICKUP, Tool::Picker); + ToolSet(*wind, WC_PEEP__WIDX_PICKUP, Tool::picker); } }); GameActions::Execute(&pickupAction); diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index aa7b9ba538..cc170fa820 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -533,7 +533,7 @@ namespace OpenRCT2::Ui::Windows GameActions::Execute(&surfaceSetStyleAction); - gCurrentToolId = Tool::UpDownArrow; + gCurrentToolId = Tool::upDownArrow; } else { @@ -562,7 +562,7 @@ namespace OpenRCT2::Ui::Windows // The tool is set to 12 here instead of 3 so that the dragging cursor is not the elevation change // cursor - gCurrentToolId = Tool::Crosshair; + gCurrentToolId = Tool::crosshair; } } else @@ -585,7 +585,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_BACKGROUND: MapInvalidateSelectionRect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; - gCurrentToolId = Tool::DigDown; + gCurrentToolId = Tool::digDown; break; } } @@ -612,7 +612,7 @@ namespace OpenRCT2::Ui::Windows MapInvalidateSelectionRect(); - if (gCurrentToolId == Tool::UpDownArrow) + if (gCurrentToolId == Tool::upDownArrow) { if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE)) return; @@ -892,7 +892,7 @@ namespace OpenRCT2::Ui::Windows { ShowGridlines(); auto* toolWindow = ContextOpenWindow(WindowClass::Land); - ToolSet(*toolWindow, WIDX_BACKGROUND, Tool::DigDown); + ToolSet(*toolWindow, WIDX_BACKGROUND, Tool::digDown); InputSetFlag(INPUT_FLAG_6, true); } } diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index 4ef9210df1..680e523c78 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -107,7 +107,7 @@ namespace OpenRCT2::Ui::Windows pressed_widgets = (1uLL << widgetIndex); _landRightsMode = mode; - ToolSet(*this, widgetIndex, Tool::UpArrow); + ToolSet(*this, widgetIndex, Tool::upArrow); InputSetFlag(INPUT_FLAG_6, true); if (kLandRightsVisibleByMode[EnumValue(mode)]) diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index f11cdeaa37..3602b4aa76 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -298,7 +298,7 @@ namespace OpenRCT2::Ui::Windows break; } case WIDX_PEOPLE_STARTING_POSITION: - if (ToolSet(*this, widgetIndex, Tool::UpArrow)) + if (ToolSet(*this, widgetIndex, Tool::upArrow)) break; ShowGridlines(); diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 80393fc4d7..efc76d9b5d 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -309,7 +309,7 @@ namespace OpenRCT2::Ui::Windows private: void WindowMazeConstructionEntranceMouseup(WidgetIndex widgetIndex) { - if (ToolSet(*this, widgetIndex, Tool::Crosshair)) + if (ToolSet(*this, widgetIndex, Tool::crosshair)) return; gRideEntranceExitPlaceType = widgetIndex == WIDX_MAZE_ENTRANCE ? ENTRANCE_TYPE_RIDE_ENTRANCE @@ -387,7 +387,7 @@ namespace OpenRCT2::Ui::Windows : WIDX_MAZE_EXIT; ToolCancel(); - ToolSet(*this, newToolWidgetIndex, Tool::Crosshair); + ToolSet(*this, newToolWidgetIndex, Tool::crosshair); WindowMazeConstructionUpdatePressedWidgets(); } diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp index 2acdb288db..23ef15726b 100644 --- a/src/openrct2-ui/windows/PatrolArea.cpp +++ b/src/openrct2-ui/windows/PatrolArea.cpp @@ -248,7 +248,7 @@ namespace OpenRCT2::Ui::Windows } else { - if (!ToolSet(*this, 0, Tool::WalkDown)) + if (!ToolSet(*this, 0, Tool::walkDown)) { ShowGridlines(); InputSetFlag(INPUT_FLAG_6, true); diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 5dd15132dc..0f87ebea42 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -4226,7 +4226,7 @@ namespace OpenRCT2::Ui::Windows SetPage(widgetIndex - WIDX_TAB_1); break; case WIDX_PAINT_INDIVIDUAL_AREA: - ToolSet(*this, WIDX_PAINT_INDIVIDUAL_AREA, Tool::PaintDown); + ToolSet(*this, WIDX_PAINT_INDIVIDUAL_AREA, Tool::paintDown); break; case WIDX_SELL_ITEM_RANDOM_COLOUR_CHECKBOX: { @@ -5340,7 +5340,7 @@ namespace OpenRCT2::Ui::Windows CancelScenerySelection(); } - while (ToolSet(*this, WIDX_BACKGROUND, Tool::Crosshair)) + while (ToolSet(*this, WIDX_BACKGROUND, Tool::crosshair)) ; gTrackDesignSaveRideIndex = rideId; diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 5b89937260..347abc5a9f 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2432,7 +2432,7 @@ namespace OpenRCT2::Ui::Windows void EntranceClick() { - if (ToolSet(*this, WIDX_ENTRANCE, Tool::Crosshair)) + if (ToolSet(*this, WIDX_ENTRANCE, Tool::crosshair)) { auto currentRide = GetRide(_currentRideIndex); if (currentRide != nullptr && !RideTryGetOriginElement(*currentRide, nullptr)) @@ -2458,7 +2458,7 @@ namespace OpenRCT2::Ui::Windows void ExitClick() { - if (ToolSet(*this, WIDX_EXIT, Tool::Crosshair)) + if (ToolSet(*this, WIDX_EXIT, Tool::crosshair)) { auto currentRide = GetRide(_currentRideIndex); if (!RideTryGetOriginElement(*currentRide, nullptr)) @@ -2628,7 +2628,7 @@ namespace OpenRCT2::Ui::Windows : WC_RIDE_CONSTRUCTION__WIDX_EXIT; ToolCancel(); - ToolSet(*this, newToolWidgetIndex, Tool::Crosshair); + ToolSet(*this, newToolWidgetIndex, Tool::crosshair); } }); auto res = GameActions::Execute(&rideEntranceExitPlaceAction); @@ -3671,7 +3671,7 @@ namespace OpenRCT2::Ui::Windows w = windowMgr->FindByClass(WindowClass::RideConstruction); if (w != nullptr) { - ToolSet(*w, WIDX_CONSTRUCT, Tool::Crosshair); + ToolSet(*w, WIDX_CONSTRUCT, Tool::crosshair); InputSetFlag(INPUT_FLAG_6, true); _trackPlaceCtrlState = false; _trackPlaceShiftState = false; diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index de45daef51..fa5f601300 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -517,11 +517,11 @@ namespace OpenRCT2::Ui::Windows if (gWindowSceneryEyedropperEnabled) { - gCurrentToolId = Tool::Crosshair; + gCurrentToolId = Tool::crosshair; } else if (_sceneryPaintEnabled) { - gCurrentToolId = Tool::PaintDown; + gCurrentToolId = Tool::paintDown; } else { @@ -531,7 +531,7 @@ namespace OpenRCT2::Ui::Windows { if (tabSelectedScenery.SceneryType == SCENERY_TYPE_BANNER) { - gCurrentToolId = Tool::EntranceDown; + gCurrentToolId = Tool::entranceDown; } else if (tabSelectedScenery.SceneryType == SCENERY_TYPE_LARGE) { @@ -556,7 +556,7 @@ namespace OpenRCT2::Ui::Windows } else { - gCurrentToolId = Tool::Arrow; + gCurrentToolId = Tool::arrow; } } } @@ -3299,7 +3299,7 @@ namespace OpenRCT2::Ui::Windows else { auto* toolWindow = ContextOpenWindow(WindowClass::Scenery); - ToolSet(*toolWindow, WIDX_SCENERY_BACKGROUND, Tool::Arrow); + ToolSet(*toolWindow, WIDX_SCENERY_BACKGROUND, Tool::arrow); InputSetFlag(INPUT_FLAG_6, true); } } diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 8928c9f27c..bc30cfdc13 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -391,7 +391,7 @@ namespace OpenRCT2::Ui::Windows WindowBase* wind = windowMgr->FindByNumber(WindowClass::Peep, peepnum); if (wind != nullptr) { - ToolSet(*wind, WC_STAFF__WIDX_PICKUP, Tool::Picker); + ToolSet(*wind, WC_STAFF__WIDX_PICKUP, Tool::picker); } }); GameActions::Execute(&pickupAction); diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 0178974e32..f45792be11 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -151,7 +151,7 @@ namespace OpenRCT2::Ui::Windows break; } case WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON: - if (!ToolSet(*this, WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON, Tool::Crosshair)) + if (!ToolSet(*this, WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON, Tool::crosshair)) { ShowGridlines(); SetPatrolAreaToRender(GetSelectedStaffType()); @@ -585,7 +585,7 @@ namespace OpenRCT2::Ui::Windows auto* wind = ContextOpenIntent(&intent); if (wind != nullptr) { - ToolSet(*wind, WC_STAFF__WIDX_PICKUP, Tool::Picker); + ToolSet(*wind, WC_STAFF__WIDX_PICKUP, Tool::picker); } }); GameActions::Execute(&pickupAction); diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 1ba6e89a6a..be48570225 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -523,7 +523,7 @@ static uint64_t PageDisabledWidgets[] = { WindowInitScrollWidgets(*this); _tileSelected = false; - ToolSet(*this, WIDX_BACKGROUND, Tool::Crosshair); + ToolSet(*this, WIDX_BACKGROUND, Tool::crosshair); } void OnUpdate() override diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index be4df91c89..12db3043c9 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -103,7 +103,7 @@ namespace OpenRCT2::Ui::Windows { SetWidgets(_trackPlaceWidgets); WindowInitScrollWidgets(*this); - ToolSet(*this, WIDX_PRICE, Tool::Crosshair); + ToolSet(*this, WIDX_PRICE, Tool::crosshair); InputSetFlag(INPUT_FLAG_6, true); WindowPushOthersRight(*this); ShowGridlines(); diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index 049e6554ae..df733c2294 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -118,7 +118,7 @@ namespace OpenRCT2::Ui::Windows break; case WIDX_CLIP_SELECTOR: // Activate the selection tool - ToolSet(*this, WIDX_BACKGROUND, Tool::Crosshair); + ToolSet(*this, WIDX_BACKGROUND, Tool::crosshair); _toolActive = true; _dragging = false; diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 9090bbdfd6..7d6748da10 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -207,7 +207,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_BACKGROUND: if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE) { - gCurrentToolId = Tool::UpDownArrow; + gCurrentToolId = Tool::upDownArrow; } break; } @@ -230,7 +230,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_BACKGROUND: MapInvalidateSelectionRect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; - gCurrentToolId = Tool::WaterDown; + gCurrentToolId = Tool::waterDown; break; } } @@ -301,7 +301,7 @@ namespace OpenRCT2::Ui::Windows auto* windowMgr = Ui::GetWindowManager(); - if (gCurrentToolId == Tool::UpDownArrow) + if (gCurrentToolId == Tool::upDownArrow) { if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE)) return; @@ -446,7 +446,7 @@ namespace OpenRCT2::Ui::Windows { ShowGridlines(); auto* toolWindow = ContextOpenWindow(WindowClass::Water); - ToolSet(*toolWindow, WIDX_BACKGROUND, Tool::WaterDown); + ToolSet(*toolWindow, WIDX_BACKGROUND, Tool::waterDown); InputSetFlag(INPUT_FLAG_6, true); } } diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index 486aca550b..3cfc1b60c4 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -256,18 +256,18 @@ enum class GuestListFilterType : int32_t enum class Tool { - Arrow = 0, - UpArrow = 2, - UpDownArrow = 3, - Picker = 7, - Crosshair = 12, - PathDown = 17, - DigDown = 18, - WaterDown = 19, - WalkDown = 22, - PaintDown = 23, - EntranceDown = 24, - Bulldozer = 27, + arrow = 0, + upArrow = 2, + upDownArrow = 3, + picker = 7, + crosshair = 12, + pathDown = 17, + digDown = 18, + waterDown = 19, + walkDown = 22, + paintDown = 23, + entranceDown = 24, + bulldozer = 27, }; namespace OpenRCT2 diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index ec02546580..647094460c 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -879,7 +879,7 @@ static bool ride_modify_entrance_or_exit(const CoordsXYE& tileElement) ToolSet( *constructionWindow, entranceType == ENTRANCE_TYPE_RIDE_ENTRANCE ? WC_RIDE_CONSTRUCTION__WIDX_ENTRANCE : WC_RIDE_CONSTRUCTION__WIDX_EXIT, - Tool::Crosshair); + Tool::crosshair); gRideEntranceExitPlaceType = entranceType; gRideEntranceExitPlaceRideIndex = rideIndex; gRideEntranceExitPlaceStationIndex = stationIndex; @@ -907,7 +907,7 @@ static bool ride_modify_entrance_or_exit(const CoordsXYE& tileElement) : WC_RIDE_CONSTRUCTION__WIDX_EXIT; ToolCancel(); - ToolSet(*constructionWindow, newToolWidgetIndex, Tool::Crosshair); + ToolSet(*constructionWindow, newToolWidgetIndex, Tool::crosshair); }); GameActions::Execute(&rideEntranceExitRemove); @@ -1072,7 +1072,7 @@ int32_t RideInitialiseConstructionWindow(Ride& ride) w = ride_create_or_find_construction_window(ride.id); - ToolSet(*w, WC_RIDE_CONSTRUCTION__WIDX_CONSTRUCT, Tool::Crosshair); + ToolSet(*w, WC_RIDE_CONSTRUCTION__WIDX_CONSTRUCT, Tool::crosshair); InputSetFlag(INPUT_FLAG_6, true); _currentlySelectedTrack = ride.GetRideTypeDescriptor().StartTrackPiece;