From b6e09bbc7e2e19fa4f78179c819f4eaad82cdb23 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 15 Sep 2025 23:34:29 +0200 Subject: [PATCH] Change code style of enums in Viewport.h --- .../interface/ViewportInteraction.cpp | 114 +++++++++--------- src/openrct2-ui/interface/ViewportQuery.cpp | 20 +-- src/openrct2-ui/ride/Construction.cpp | 4 +- src/openrct2-ui/scripting/CustomMenu.cpp | 26 ++-- src/openrct2-ui/windows/Footpath.cpp | 28 ++--- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2-ui/windows/LandRights.cpp | 4 +- src/openrct2-ui/windows/MazeConstruction.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 28 ++--- src/openrct2-ui/windows/RideConstruction.cpp | 24 ++-- src/openrct2-ui/windows/Scenery.cpp | 56 ++++----- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/TileInspector.cpp | 6 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 8 +- src/openrct2-ui/windows/Water.cpp | 4 +- src/openrct2/drawing/LightFX.cpp | 4 +- src/openrct2/interface/InteractiveConsole.cpp | 2 +- src/openrct2/interface/Viewport.cpp | 78 ++++++------ src/openrct2/interface/Viewport.h | 46 +++---- src/openrct2/paint/Paint.Entity.cpp | 2 +- src/openrct2/paint/Paint.cpp | 6 +- src/openrct2/paint/Painter.cpp | 2 +- src/openrct2/paint/VirtualFloor.cpp | 2 +- .../paint/tile_element/Paint.Banner.cpp | 4 +- .../paint/tile_element/Paint.Entrance.cpp | 10 +- .../paint/tile_element/Paint.LargeScenery.cpp | 4 +- .../paint/tile_element/Paint.Path.cpp | 10 +- .../paint/tile_element/Paint.PathAddition.cpp | 8 +- .../paint/tile_element/Paint.SmallScenery.cpp | 4 +- .../paint/tile_element/Paint.Surface.cpp | 8 +- .../paint/tile_element/Paint.TileElement.cpp | 4 +- .../paint/tile_element/Paint.Wall.cpp | 4 +- src/openrct2/paint/track/gentle/Circus.cpp | 4 +- .../paint/track/gentle/CrookedHouse.cpp | 2 +- .../paint/track/gentle/FerrisWheel.cpp | 4 +- .../paint/track/gentle/HauntedHouse.cpp | 4 +- .../paint/track/gentle/MerryGoRound.cpp | 4 +- .../paint/track/gentle/SpaceRings.cpp | 6 +- src/openrct2/paint/track/thrill/3dCinema.cpp | 4 +- .../paint/track/thrill/Enterprise.cpp | 4 +- .../paint/track/thrill/MagicCarpet.cpp | 4 +- .../paint/track/thrill/MotionSimulator.cpp | 4 +- .../track/thrill/SwingingInverterShip.cpp | 4 +- .../paint/track/thrill/SwingingShip.cpp | 4 +- src/openrct2/paint/track/thrill/TopSpin.cpp | 4 +- src/openrct2/paint/track/thrill/Twist.cpp | 4 +- src/openrct2/ride/TrackDesignSave.cpp | 14 +-- src/openrct2/ride/TrackPaint.cpp | 6 +- 48 files changed, 301 insertions(+), 301 deletions(-) diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 764ed36ce0..0f30ccea69 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -93,25 +93,25 @@ namespace OpenRCT2::Ui info = GetMapCoordinatesFromPos( screenCoords, EnumsToFlags( - ViewportInteractionItem::Entity, ViewportInteractionItem::Ride, ViewportInteractionItem::ParkEntrance)); - auto tileElement = info.interactionType != ViewportInteractionItem::Entity ? info.Element : nullptr; - // Only valid when info.interactionType == ViewportInteractionItem::Entity, but can't assign nullptr without compiler + ViewportInteractionItem::entity, ViewportInteractionItem::ride, ViewportInteractionItem::parkEntrance)); + auto tileElement = info.interactionType != ViewportInteractionItem::entity ? info.Element : nullptr; + // Only valid when info.interactionType == ViewportInteractionItem::entity, but can't assign nullptr without compiler // complaining auto sprite = info.Entity; // Allows only balloons to be popped and ducks to be quacked in title screen if (gLegacyScene == LegacyScene::titleSequence) { - if (info.interactionType == ViewportInteractionItem::Entity && (sprite->Is() || sprite->Is())) + if (info.interactionType == ViewportInteractionItem::entity && (sprite->Is() || sprite->Is())) return info; - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; return info; } switch (info.interactionType) { - case ViewportInteractionItem::Entity: + case ViewportInteractionItem::entity: switch (sprite->Type) { case EntityType::Vehicle: @@ -120,7 +120,7 @@ namespace OpenRCT2::Ui if (vehicle != nullptr && !vehicle->IsCableLift()) vehicle->SetMapToolbar(); else - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; } break; case EntityType::Guest: @@ -133,7 +133,7 @@ namespace OpenRCT2::Ui } else { - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; } } break; @@ -141,11 +141,11 @@ namespace OpenRCT2::Ui break; } break; - case ViewportInteractionItem::Ride: + case ViewportInteractionItem::ride: Guard::ArgumentNotNull(tileElement); RideSetMapTooltip(*tileElement); break; - case ViewportInteractionItem::ParkEntrance: + case ViewportInteractionItem::parkEntrance: { auto& gameState = getGameState(); auto parkName = gameState.park.name.c_str(); @@ -157,18 +157,18 @@ namespace OpenRCT2::Ui break; } default: - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; break; } // If nothing is under cursor, find a close by peep - if (info.interactionType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::none) { auto peep = ViewportInteractionGetClosestPeep(screenCoords, 32); if (peep != nullptr) { info.Entity = peep; - info.interactionType = ViewportInteractionItem::Entity; + info.interactionType = ViewportInteractionItem::entity; info.Loc.x = peep->x; info.Loc.y = peep->y; PeepSetMapTooltip(peep); @@ -184,9 +184,9 @@ namespace OpenRCT2::Ui switch (info.interactionType) { - case ViewportInteractionItem::Entity: - case ViewportInteractionItem::Ride: - case ViewportInteractionItem::ParkEntrance: + case ViewportInteractionItem::entity: + case ViewportInteractionItem::ride: + case ViewportInteractionItem::parkEntrance: return true; default: return false; @@ -200,7 +200,7 @@ namespace OpenRCT2::Ui switch (info.interactionType) { - case ViewportInteractionItem::Entity: + case ViewportInteractionItem::entity: { auto entity = info.Entity; switch (entity->Type) @@ -246,14 +246,14 @@ namespace OpenRCT2::Ui } return true; } - case ViewportInteractionItem::Ride: + case ViewportInteractionItem::ride: { auto intent = Intent(WD_TRACK); intent.PutExtra(INTENT_EXTRA_TILE_ELEMENT, info.Element); ContextOpenIntent(&intent); return true; } - case ViewportInteractionItem::ParkEntrance: + case ViewportInteractionItem::parkEntrance: ContextOpenWindow(WindowClass::ParkInformation); return true; default: @@ -279,25 +279,25 @@ namespace OpenRCT2::Ui return info; constexpr auto flags = static_cast( - ~EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water)); + ~EnumsToFlags(ViewportInteractionItem::terrain, ViewportInteractionItem::water)); info = GetMapCoordinatesFromPos(screenCoords, flags); auto tileElement = info.Element; switch (info.interactionType) { - case ViewportInteractionItem::Entity: + case ViewportInteractionItem::entity: { auto sprite = info.Entity; if (gLegacyScene == LegacyScene::scenarioEditor || sprite->Type != EntityType::Vehicle) { - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; return info; } auto vehicle = sprite->As(); if (vehicle == nullptr) { - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; return info; } ride = GetRide(vehicle->ride); @@ -310,23 +310,23 @@ namespace OpenRCT2::Ui } return info; } - case ViewportInteractionItem::Ride: + case ViewportInteractionItem::ride: { if (gLegacyScene == LegacyScene::scenarioEditor) { - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; return info; } if (tileElement->GetType() == TileElementType::Path) { - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; return info; } ride = GetRide(tileElement->GetRideIndex()); if (ride == nullptr) { - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; return info; } @@ -381,7 +381,7 @@ namespace OpenRCT2::Ui // FIXME: Why does it *2 the value? if (!getGameState().cheats.sandboxMode && !MapIsLocationOwned({ info.Loc, tileElement->GetBaseZ() * 2 })) { - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; return info; } @@ -408,7 +408,7 @@ namespace OpenRCT2::Ui SetMapTooltip(ft); return info; } - case ViewportInteractionItem::Wall: + case ViewportInteractionItem::wall: { auto* wallEntry = tileElement->AsWall()->GetEntry(); if (wallEntry->scrolling_mode != kScrollingModeNone) @@ -427,7 +427,7 @@ namespace OpenRCT2::Ui } break; } - case ViewportInteractionItem::LargeScenery: + case ViewportInteractionItem::largeScenery: { auto* sceneryEntry = tileElement->AsLargeScenery()->GetEntry(); if (sceneryEntry->scrolling_mode != kScrollingModeNone) @@ -446,7 +446,7 @@ namespace OpenRCT2::Ui } break; } - case ViewportInteractionItem::Banner: + case ViewportInteractionItem::banner: { auto banner = tileElement->AsBanner()->GetBanner(); if (banner != nullptr) @@ -473,7 +473,7 @@ namespace OpenRCT2::Ui if (windowMgr->FindByClass(WindowClass::RideConstruction) == nullptr && windowMgr->FindByClass(WindowClass::Footpath) == nullptr) { - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; return info; } } @@ -481,7 +481,7 @@ namespace OpenRCT2::Ui auto ft = Formatter(); switch (info.interactionType) { - case ViewportInteractionItem::Scenery: + case ViewportInteractionItem::scenery: { auto* sceneryEntry = tileElement->AsSmallScenery()->GetEntry(); ft.Add(STR_MAP_TOOLTIP_STRINGID_CLICK_TO_REMOVE); @@ -489,7 +489,7 @@ namespace OpenRCT2::Ui SetMapTooltip(ft); return info; } - case ViewportInteractionItem::Footpath: + case ViewportInteractionItem::footpath: ft.Add(STR_MAP_TOOLTIP_STRINGID_CLICK_TO_REMOVE); if (tileElement->AsPath()->IsQueue()) ft.Add(STR_QUEUE_LINE_MAP_TIP); @@ -498,7 +498,7 @@ namespace OpenRCT2::Ui SetMapTooltip(ft); return info; - case ViewportInteractionItem::PathAddition: + case ViewportInteractionItem::pathAddition: { auto* pathAddEntry = tileElement->AsPath()->GetAdditionEntry(); ft.Add(STR_MAP_TOOLTIP_STRINGID_CLICK_TO_REMOVE); @@ -510,7 +510,7 @@ namespace OpenRCT2::Ui SetMapTooltip(ft); return info; } - case ViewportInteractionItem::ParkEntrance: + case ViewportInteractionItem::parkEntrance: if (gLegacyScene != LegacyScene::scenarioEditor && !getGameState().cheats.sandboxMode) break; @@ -522,7 +522,7 @@ namespace OpenRCT2::Ui SetMapTooltip(ft); return info; - case ViewportInteractionItem::Wall: + case ViewportInteractionItem::wall: { auto* wallEntry = tileElement->AsWall()->GetEntry(); ft.Add(STR_MAP_TOOLTIP_STRINGID_CLICK_TO_REMOVE); @@ -530,7 +530,7 @@ namespace OpenRCT2::Ui SetMapTooltip(ft); return info; } - case ViewportInteractionItem::LargeScenery: + case ViewportInteractionItem::largeScenery: { auto* sceneryEntry = tileElement->AsLargeScenery()->GetEntry(); ft.Add(STR_MAP_TOOLTIP_STRINGID_CLICK_TO_REMOVE); @@ -542,7 +542,7 @@ namespace OpenRCT2::Ui break; } - info.interactionType = ViewportInteractionItem::None; + info.interactionType = ViewportInteractionItem::none; return info; } @@ -550,7 +550,7 @@ namespace OpenRCT2::Ui { auto info = ViewportInteractionGetItemRight(screenCoords); - return info.interactionType != ViewportInteractionItem::None; + return info.interactionType != ViewportInteractionItem::none; } /** @@ -564,13 +564,13 @@ namespace OpenRCT2::Ui switch (info.interactionType) { - case ViewportInteractionItem::None: - case ViewportInteractionItem::Terrain: - case ViewportInteractionItem::Water: - case ViewportInteractionItem::Label: + case ViewportInteractionItem::none: + case ViewportInteractionItem::terrain: + case ViewportInteractionItem::water: + case ViewportInteractionItem::label: return false; - case ViewportInteractionItem::Entity: + case ViewportInteractionItem::entity: { auto entity = info.Entity; if (entity->Type == EntityType::Vehicle) @@ -588,29 +588,29 @@ namespace OpenRCT2::Ui } } break; - case ViewportInteractionItem::Ride: + case ViewportInteractionItem::ride: tileElement = { info.Loc, info.Element }; RideModify(tileElement); break; - case ViewportInteractionItem::Scenery: + case ViewportInteractionItem::scenery: ViewportInteractionRemoveScenery(*info.Element->AsSmallScenery(), info.Loc); break; - case ViewportInteractionItem::Footpath: + case ViewportInteractionItem::footpath: ViewportInteractionRemoveFootpath(*info.Element->AsPath(), info.Loc); break; - case ViewportInteractionItem::PathAddition: + case ViewportInteractionItem::pathAddition: ViewportInteractionRemovePathAddition(*info.Element->AsPath(), info.Loc); break; - case ViewportInteractionItem::ParkEntrance: + case ViewportInteractionItem::parkEntrance: ViewportInteractionRemoveParkEntrance(*info.Element->AsEntrance(), info.Loc); break; - case ViewportInteractionItem::Wall: + case ViewportInteractionItem::wall: ViewportInteractionRemoveParkWall(*info.Element->AsWall(), info.Loc); break; - case ViewportInteractionItem::LargeScenery: + case ViewportInteractionItem::largeScenery: ViewportInteractionRemoveLargeScenery(*info.Element->AsLargeScenery(), info.Loc); break; - case ViewportInteractionItem::Banner: + case ViewportInteractionItem::banner: ContextOpenDetailWindow(WD_BANNER, info.Element->AsBanner()->GetIndex().ToUnderlying()); break; } @@ -802,17 +802,17 @@ namespace OpenRCT2::Ui } auto viewport = window->viewport; auto info = GetMapCoordinatesFromPosWindow( - window, screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water)); + window, screenCoords, EnumsToFlags(ViewportInteractionItem::terrain, ViewportInteractionItem::water)); auto initialPos = info.Loc; - if (info.interactionType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::none) { initialPos.SetNull(); return initialPos; } int16_t waterHeight = 0; - if (info.interactionType == ViewportInteractionItem::Water) + if (info.interactionType == ViewportInteractionItem::water) { waterHeight = info.Element->AsSurface()->GetWaterHeight(); } @@ -823,7 +823,7 @@ namespace OpenRCT2::Ui for (int32_t i = 0; i < 5; i++) { int16_t z = waterHeight; - if (info.interactionType != ViewportInteractionItem::Water) + if (info.interactionType != ViewportInteractionItem::water) { z = TileElementHeight(mapPos); } diff --git a/src/openrct2-ui/interface/ViewportQuery.cpp b/src/openrct2-ui/interface/ViewportQuery.cpp index e07ad66822..e11091b659 100644 --- a/src/openrct2-ui/interface/ViewportQuery.cpp +++ b/src/openrct2-ui/interface/ViewportQuery.cpp @@ -47,13 +47,13 @@ namespace OpenRCT2::Ui return position; } auto viewport = window->viewport; - auto info = GetMapCoordinatesFromPosWindow(window, screenCoords, EnumsToFlags(ViewportInteractionItem::Footpath)); - if (info.interactionType != ViewportInteractionItem::Footpath + auto info = GetMapCoordinatesFromPosWindow(window, screenCoords, EnumsToFlags(ViewportInteractionItem::footpath)); + if (info.interactionType != ViewportInteractionItem::footpath || !(viewport->flags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_HIDE_VERTICAL))) { info = GetMapCoordinatesFromPosWindow( - window, screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Footpath)); - if (info.interactionType == ViewportInteractionItem::None) + window, screenCoords, EnumsToFlags(ViewportInteractionItem::terrain, ViewportInteractionItem::footpath)); + if (info.interactionType == ViewportInteractionItem::none) { auto position = info.Loc; position.SetNull(); @@ -66,7 +66,7 @@ namespace OpenRCT2::Ui auto myTileElement = info.Element; auto position = info.Loc.ToTileCentre(); auto z = 0; - if (info.interactionType == ViewportInteractionItem::Footpath) + if (info.interactionType == ViewportInteractionItem::footpath) { z = myTileElement->GetBaseZ(); if (myTileElement->AsPath()->IsSloped()) @@ -79,7 +79,7 @@ namespace OpenRCT2::Ui for (int32_t i = 0; i < 5; i++) { - if (info.interactionType != ViewportInteractionItem::Footpath) + if (info.interactionType != ViewportInteractionItem::footpath) { z = TileElementHeight(position); } @@ -146,9 +146,9 @@ namespace OpenRCT2::Ui return ret; } auto viewport = window->viewport; - auto info = GetMapCoordinatesFromPosWindow(window, screenCoords, EnumsToFlags(ViewportInteractionItem::Ride)); + auto info = GetMapCoordinatesFromPosWindow(window, screenCoords, EnumsToFlags(ViewportInteractionItem::ride)); *tileElement = info.Element; - if (info.interactionType == ViewportInteractionItem::Ride + if (info.interactionType == ViewportInteractionItem::ride && viewport->flags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_HIDE_VERTICAL) && (*tileElement)->GetType() == TileElementType::Entrance) { @@ -166,8 +166,8 @@ namespace OpenRCT2::Ui info = GetMapCoordinatesFromPosWindow( window, screenCoords, - EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Footpath, ViewportInteractionItem::Ride)); - if (info.interactionType == ViewportInteractionItem::Ride && (*tileElement)->GetType() == TileElementType::Entrance) + EnumsToFlags(ViewportInteractionItem::terrain, ViewportInteractionItem::footpath, ViewportInteractionItem::ride)); + if (info.interactionType == ViewportInteractionItem::ride && (*tileElement)->GetType() == TileElementType::Entrance) { uint32_t directions = (*tileElement)->AsEntrance()->GetDirections(); if (directions & 0x0F) diff --git a/src/openrct2-ui/ride/Construction.cpp b/src/openrct2-ui/ride/Construction.cpp index 921e67c822..3a7c89a464 100644 --- a/src/openrct2-ui/ride/Construction.cpp +++ b/src/openrct2-ui/ride/Construction.cpp @@ -368,8 +368,8 @@ namespace OpenRCT2 CoordsXYZD entranceExitCoords{}; gRideEntranceExitPlaceDirection = kInvalidDirection; // determine if the mouse is hovering over a station - that's the station to add the entrance to - auto info = GetMapCoordinatesFromPos(screenCoords, EnumsToFlags(ViewportInteractionItem::Ride)); - if (info.interactionType != ViewportInteractionItem::None) + auto info = GetMapCoordinatesFromPos(screenCoords, EnumsToFlags(ViewportInteractionItem::ride)); + if (info.interactionType != ViewportInteractionItem::none) { if (info.Element->GetType() == TileElementType::Track) { diff --git a/src/openrct2-ui/scripting/CustomMenu.cpp b/src/openrct2-ui/scripting/CustomMenu.cpp index e0d2392695..3b93d61ff7 100644 --- a/src/openrct2-ui/scripting/CustomMenu.cpp +++ b/src/openrct2-ui/scripting/CustomMenu.cpp @@ -71,18 +71,18 @@ namespace OpenRCT2::Scripting static const DukEnumMap ToolFilterMap( { - { "terrain", ViewportInteractionItem::Terrain }, - { "entity", ViewportInteractionItem::Entity }, - { "ride", ViewportInteractionItem::Ride }, - { "water", ViewportInteractionItem::Water }, - { "scenery", ViewportInteractionItem::Scenery }, - { "footpath", ViewportInteractionItem::Footpath }, - { "footpath_item", ViewportInteractionItem::PathAddition }, - { "park_entrance", ViewportInteractionItem::ParkEntrance }, - { "wall", ViewportInteractionItem::Wall }, - { "large_scenery", ViewportInteractionItem::LargeScenery }, - { "label", ViewportInteractionItem::Label }, - { "banner", ViewportInteractionItem::Banner }, + { "terrain", ViewportInteractionItem::terrain }, + { "entity", ViewportInteractionItem::entity }, + { "ride", ViewportInteractionItem::ride }, + { "water", ViewportInteractionItem::water }, + { "scenery", ViewportInteractionItem::scenery }, + { "footpath", ViewportInteractionItem::footpath }, + { "footpath_item", ViewportInteractionItem::pathAddition }, + { "park_entrance", ViewportInteractionItem::parkEntrance }, + { "wall", ViewportInteractionItem::wall }, + { "large_scenery", ViewportInteractionItem::largeScenery }, + { "label", ViewportInteractionItem::label }, + { "banner", ViewportInteractionItem::banner }, }); template<> @@ -200,7 +200,7 @@ namespace OpenRCT2::Scripting obj.Set("screenCoords", ToDuk(ctx, screenCoords)); obj.Set("mapCoords", ToDuk(ctx, info.Loc)); - if (info.interactionType == ViewportInteractionItem::Entity && info.Entity != nullptr) + if (info.interactionType == ViewportInteractionItem::entity && info.Entity != nullptr) { obj.Set("entityId", info.Entity->Id.ToUnderlying()); } diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index ef48948e99..fc3e617827 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -224,7 +224,7 @@ namespace OpenRCT2::Ui::Windows void OnClose() override { FootpathUpdateProvisional(); - ViewportSetVisibility(ViewportVisibility::Default); + ViewportSetVisibility(ViewportVisibility::standard); MapInvalidateMapSelectionTiles(); gMapSelectFlags.unset(MapSelectFlag::enableConstruct); @@ -537,7 +537,7 @@ namespace OpenRCT2::Ui::Windows return { _footpathPlaceZ, kTileSlopeFlat }; auto info = GetMapCoordinatesFromPos( - screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Footpath)); + screenCoords, EnumsToFlags(ViewportInteractionItem::terrain, ViewportInteractionItem::footpath)); return FootpathGetPlacementFromInfo(info); } @@ -814,12 +814,12 @@ namespace OpenRCT2::Ui::Windows if (im.IsModifierKeyPressed(ModifierKey::ctrl)) { constexpr auto interactionFlags = EnumsToFlags( - ViewportInteractionItem::Terrain, ViewportInteractionItem::Ride, ViewportInteractionItem::Scenery, - ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, - ViewportInteractionItem::LargeScenery); + ViewportInteractionItem::terrain, ViewportInteractionItem::ride, ViewportInteractionItem::scenery, + ViewportInteractionItem::footpath, ViewportInteractionItem::wall, + ViewportInteractionItem::largeScenery); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); - if (info.interactionType != ViewportInteractionItem::None) + if (info.interactionType != ViewportInteractionItem::none) { const bool allowInvalidHeights = getGameState().cheats.allowTrackPlaceInvalidHeights; const auto heightStep = kCoordsZStep * (!allowInvalidHeights ? 2 : 1); @@ -872,9 +872,9 @@ namespace OpenRCT2::Ui::Windows if (!_footpathPlaceCtrlState) { auto info = GetMapCoordinatesFromPos( - screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Footpath)); + screenCoords, EnumsToFlags(ViewportInteractionItem::terrain, ViewportInteractionItem::footpath)); - if (info.interactionType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::none) return std::nullopt; mapCoords = info.Loc; @@ -920,7 +920,7 @@ namespace OpenRCT2::Ui::Windows FootpathPlacementResult FootpathGetPlacementFromInfo(const InteractionInfo& info) { - if (info.interactionType == ViewportInteractionItem::None || info.Element == nullptr) + if (info.interactionType == ViewportInteractionItem::none || info.Element == nullptr) { gMapSelectFlags.unset(MapSelectFlag::enable); FootpathUpdateProvisional(); @@ -929,7 +929,7 @@ namespace OpenRCT2::Ui::Windows switch (info.interactionType) { - case ViewportInteractionItem::Terrain: + case ViewportInteractionItem::terrain: { auto surfaceElement = info.Element->AsSurface(); if (surfaceElement != nullptr) @@ -938,7 +938,7 @@ namespace OpenRCT2::Ui::Windows } break; } - case ViewportInteractionItem::Footpath: + case ViewportInteractionItem::footpath: { auto pathElement = info.Element->AsPath(); if (pathElement != nullptr) @@ -1199,7 +1199,7 @@ namespace OpenRCT2::Ui::Windows if (gFootpathGroundFlags & ELEMENT_IS_UNDERGROUND) { - ViewportSetVisibility(ViewportVisibility::UndergroundViewOn); + ViewportSetVisibility(ViewportVisibility::undergroundViewOn); } _footpathConstructFromPosition = footpathLoc; @@ -1706,11 +1706,11 @@ namespace OpenRCT2::Ui::Windows if (gFootpathGroundFlags & ELEMENT_IS_UNDERGROUND) { - ViewportSetVisibility(ViewportVisibility::UndergroundViewOn); + ViewportSetVisibility(ViewportVisibility::undergroundViewOn); } else { - ViewportSetVisibility(ViewportVisibility::UndergroundViewOff); + ViewportSetVisibility(ViewportVisibility::undergroundViewOff); } } diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 271e4878c4..fe4661a830 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -991,7 +991,7 @@ namespace OpenRCT2::Ui::Windows gPickupPeepImage = ImageId(); auto info = GetMapCoordinatesFromPos(screenCoords, kViewportInteractionItemAll); - if (info.interactionType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::none) return; gPickupPeepX = screenCoords.x - 1; diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index 7293408f55..b6b4f7665c 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -463,8 +463,8 @@ namespace OpenRCT2::Ui::Windows gMapSelectFlags.unset(MapSelectFlag::enable); auto info = GetMapCoordinatesFromPos( - screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water)); - if (info.interactionType == ViewportInteractionItem::None) + screenCoords, EnumsToFlags(ViewportInteractionItem::terrain, ViewportInteractionItem::water)); + if (info.interactionType == ViewportInteractionItem::none) { if (_landRightsCost != kMoney64Undefined) { diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 610f1f1fe4..a81fe1bd9f 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -116,7 +116,7 @@ namespace OpenRCT2::Ui::Windows void OnClose() override { RideConstructionInvalidateCurrentTrack(); - ViewportSetVisibility(ViewportVisibility::Default); + ViewportSetVisibility(ViewportVisibility::standard); MapInvalidateMapSelectionTiles(); gMapSelectFlags.unset(MapSelectFlag::enableConstruct); diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 16ac945a55..d134a1ece1 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -4169,9 +4169,9 @@ namespace OpenRCT2::Ui::Windows void SetTrackColourScheme(const ScreenCoordsXY& screenPos) { auto newColourScheme = static_cast(_rideColour); - auto info = GetMapCoordinatesFromPos(screenPos, EnumsToFlags(ViewportInteractionItem::Ride)); + auto info = GetMapCoordinatesFromPos(screenPos, EnumsToFlags(ViewportInteractionItem::ride)); - if (info.interactionType != ViewportInteractionItem::Ride) + if (info.interactionType != ViewportInteractionItem::ride) return; if (info.Element->GetType() != TileElementType::Track) return; @@ -5515,15 +5515,15 @@ namespace OpenRCT2::Ui::Windows _collectTrackDesignScenery = true; // Default to true in case user does not select anything valid constexpr auto interactionFlags = EnumsToFlags( - ViewportInteractionItem::Scenery, ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, - ViewportInteractionItem::LargeScenery); + ViewportInteractionItem::scenery, ViewportInteractionItem::footpath, ViewportInteractionItem::wall, + ViewportInteractionItem::largeScenery); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); switch (info.interactionType) { - case ViewportInteractionItem::Scenery: - case ViewportInteractionItem::LargeScenery: - case ViewportInteractionItem::Wall: - case ViewportInteractionItem::Footpath: + case ViewportInteractionItem::scenery: + case ViewportInteractionItem::largeScenery: + case ViewportInteractionItem::wall: + case ViewportInteractionItem::footpath: _collectTrackDesignScenery = !TrackDesignSaveContainsTileElement(info.Element); TrackDesignSaveSelectTileElement(info.interactionType, info.Loc, info.Element, _collectTrackDesignScenery); break; @@ -5540,15 +5540,15 @@ namespace OpenRCT2::Ui::Windows _lastSceneryY = screenCoords.y; constexpr auto interactionFlags = EnumsToFlags( - ViewportInteractionItem::Scenery, ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, - ViewportInteractionItem::LargeScenery); + ViewportInteractionItem::scenery, ViewportInteractionItem::footpath, ViewportInteractionItem::wall, + ViewportInteractionItem::largeScenery); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); switch (info.interactionType) { - case ViewportInteractionItem::Scenery: - case ViewportInteractionItem::LargeScenery: - case ViewportInteractionItem::Wall: - case ViewportInteractionItem::Footpath: + case ViewportInteractionItem::scenery: + case ViewportInteractionItem::largeScenery: + case ViewportInteractionItem::wall: + case ViewportInteractionItem::footpath: TrackDesignSaveSelectTileElement(info.interactionType, info.Loc, info.Element, _collectTrackDesignScenery); break; default: diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 7fd4ce26ae..b6d26ab523 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -284,7 +284,7 @@ namespace OpenRCT2::Ui::Windows void OnClose() override { RideConstructionInvalidateCurrentTrack(); - ViewportSetVisibility(ViewportVisibility::Default); + ViewportSetVisibility(ViewportVisibility::standard); MapInvalidateMapSelectionTiles(); gMapSelectFlags.unset(MapSelectFlag::enableConstruct); @@ -2363,14 +2363,14 @@ namespace OpenRCT2::Ui::Windows const auto resultData = res.GetData(); if (resultData.GroundFlags & ELEMENT_IS_UNDERGROUND) { - ViewportSetVisibility(ViewportVisibility::UndergroundViewOn); + ViewportSetVisibility(ViewportVisibility::undergroundViewOn); } const bool helixSelected = (_currentlySelectedTrack.isTrackType) && TrackTypeIsHelix(_currentlySelectedTrack.trackType); if (helixSelected || (_currentTrackPitchEnd != TrackPitch::None)) { - ViewportSetVisibility(ViewportVisibility::TrackHeights); + ViewportSetVisibility(ViewportVisibility::trackHeights); } } @@ -3056,12 +3056,12 @@ namespace OpenRCT2::Ui::Windows if (im.IsModifierKeyPressed(ModifierKey::ctrl)) { constexpr auto interactionFlags = EnumsToFlags( - ViewportInteractionItem::Terrain, ViewportInteractionItem::Ride, ViewportInteractionItem::Footpath, - ViewportInteractionItem::PathAddition, ViewportInteractionItem::LargeScenery, - ViewportInteractionItem::Label, ViewportInteractionItem::Banner); + ViewportInteractionItem::terrain, ViewportInteractionItem::ride, ViewportInteractionItem::footpath, + ViewportInteractionItem::pathAddition, ViewportInteractionItem::largeScenery, + ViewportInteractionItem::label, ViewportInteractionItem::banner); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); - if (info.interactionType != ViewportInteractionItem::None) + if (info.interactionType != ViewportInteractionItem::none) { _trackPlaceCtrlZ = info.Element->GetBaseZ(); _trackPlaceCtrlState = true; @@ -4780,9 +4780,9 @@ namespace OpenRCT2::Ui::Windows _unkF440C5 = { trackPos, static_cast(trackDirection) }; _currentTrackSelectionFlags.set(TrackSelectionFlag::track); - ViewportSetVisibility(ViewportVisibility::UndergroundViewOff); + ViewportSetVisibility(ViewportVisibility::undergroundViewOff); if (_currentTrackPitchEnd != TrackPitch::None) - ViewportSetVisibility(ViewportVisibility::TrackHeights); + ViewportSetVisibility(ViewportVisibility::trackHeights); return result.Cost; } @@ -4813,11 +4813,11 @@ namespace OpenRCT2::Ui::Windows _currentTrackSelectionFlags.set(TrackSelectionFlag::track); const auto resultData = res.GetData(); - const auto visiblity = (resultData.GroundFlags & ELEMENT_IS_UNDERGROUND) ? ViewportVisibility::UndergroundViewOn - : ViewportVisibility::UndergroundViewOff; + const auto visiblity = (resultData.GroundFlags & ELEMENT_IS_UNDERGROUND) ? ViewportVisibility::undergroundViewOn + : ViewportVisibility::undergroundViewOff; ViewportSetVisibility(visiblity); if (_currentTrackPitchEnd != TrackPitch::None) - ViewportSetVisibility(ViewportVisibility::TrackHeights); + ViewportSetVisibility(ViewportVisibility::trackHeights); if (!(gMapSelectFlags.has(MapSelectFlag::enable))) { diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 2cc330de60..a9d1ba5166 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -255,7 +255,7 @@ namespace OpenRCT2::Ui::Windows { SceneryRemoveGhostToolPlacement(); HideGridlines(); - ViewportSetVisibility(ViewportVisibility::Default); + ViewportSetVisibility(ViewportVisibility::standard); if (gWindowSceneryScatterEnabled) { @@ -2107,12 +2107,12 @@ namespace OpenRCT2::Ui::Windows if (placementData.GroundFlags & ELEMENT_IS_UNDERGROUND) { // Set underground on - ViewportSetVisibility(ViewportVisibility::UndergroundViewGhostOn); + ViewportSetVisibility(ViewportVisibility::undergroundViewGhostOn); } else { // Set underground off - ViewportSetVisibility(ViewportVisibility::UndergroundViewGhostOff); + ViewportSetVisibility(ViewportVisibility::undergroundViewGhostOff); } gSceneryGhostType |= SCENERY_GHOST_FLAG_0; @@ -2193,12 +2193,12 @@ namespace OpenRCT2::Ui::Windows if (placementData.GroundFlags & ELEMENT_IS_UNDERGROUND) { // Set underground on - ViewportSetVisibility(ViewportVisibility::UndergroundViewGhostOn); + ViewportSetVisibility(ViewportVisibility::undergroundViewGhostOn); } else { // Set underground off - ViewportSetVisibility(ViewportVisibility::UndergroundViewGhostOff); + ViewportSetVisibility(ViewportVisibility::undergroundViewGhostOff); } gSceneryGhostType |= SCENERY_GHOST_FLAG_3; @@ -2232,13 +2232,13 @@ namespace OpenRCT2::Ui::Windows void RepaintSceneryToolDown(const ScreenCoordsXY& screenCoords, WidgetIndex widgetIndex) { constexpr auto flag = EnumsToFlags( - ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery, - ViewportInteractionItem::Banner); + ViewportInteractionItem::scenery, ViewportInteractionItem::wall, ViewportInteractionItem::largeScenery, + ViewportInteractionItem::banner); auto info = GetMapCoordinatesFromPos(screenCoords, flag); auto& gameState = getGameState(); switch (info.interactionType) { - case ViewportInteractionItem::Scenery: + case ViewportInteractionItem::scenery: { auto* sceneryEntry = info.Element->AsSmallScenery()->GetEntry(); @@ -2254,7 +2254,7 @@ namespace OpenRCT2::Ui::Windows GameActions::Execute(&repaintScenery, gameState); break; } - case ViewportInteractionItem::Wall: + case ViewportInteractionItem::wall: { auto* scenery_entry = info.Element->AsWall()->GetEntry(); @@ -2269,7 +2269,7 @@ namespace OpenRCT2::Ui::Windows GameActions::Execute(&repaintScenery, gameState); break; } - case ViewportInteractionItem::LargeScenery: + case ViewportInteractionItem::largeScenery: { auto* sceneryEntry = info.Element->AsLargeScenery()->GetEntry(); @@ -2285,7 +2285,7 @@ namespace OpenRCT2::Ui::Windows GameActions::Execute(&repaintScenery, gameState); break; } - case ViewportInteractionItem::Banner: + case ViewportInteractionItem::banner: { auto banner = info.Element->AsBanner()->GetBanner(); if (banner != nullptr) @@ -2310,12 +2310,12 @@ namespace OpenRCT2::Ui::Windows void SceneryEyedropperToolDown(const ScreenCoordsXY& screenCoords, WidgetIndex widgetIndex) { constexpr auto flag = EnumsToFlags( - ViewportInteractionItem::Scenery, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery, - ViewportInteractionItem::Banner, ViewportInteractionItem::PathAddition); + ViewportInteractionItem::scenery, ViewportInteractionItem::wall, ViewportInteractionItem::largeScenery, + ViewportInteractionItem::banner, ViewportInteractionItem::pathAddition); auto info = GetMapCoordinatesFromPos(screenCoords, flag); switch (info.interactionType) { - case ViewportInteractionItem::Scenery: + case ViewportInteractionItem::scenery: { SmallSceneryElement* sceneryElement = info.Element->AsSmallScenery(); auto entryIndex = sceneryElement->GetEntryIndex(); @@ -2329,7 +2329,7 @@ namespace OpenRCT2::Ui::Windows } break; } - case ViewportInteractionItem::Wall: + case ViewportInteractionItem::wall: { auto entryIndex = info.Element->AsWall()->GetEntryIndex(); auto* sceneryEntry = ObjectManager::GetObjectEntry(entryIndex); @@ -2342,7 +2342,7 @@ namespace OpenRCT2::Ui::Windows } break; } - case ViewportInteractionItem::LargeScenery: + case ViewportInteractionItem::largeScenery: { auto entryIndex = info.Element->AsLargeScenery()->GetEntryIndex(); auto* sceneryEntry = ObjectManager::GetObjectEntry(entryIndex); @@ -2355,7 +2355,7 @@ namespace OpenRCT2::Ui::Windows } break; } - case ViewportInteractionItem::Banner: + case ViewportInteractionItem::banner: { auto banner = info.Element->AsBanner()->GetBanner(); if (banner != nullptr) @@ -2369,7 +2369,7 @@ namespace OpenRCT2::Ui::Windows } break; } - case ViewportInteractionItem::PathAddition: + case ViewportInteractionItem::pathAddition: { auto entryIndex = info.Element->AsPath()->GetAdditionEntryIndex(); auto* pathAdditionEntry = ObjectManager::GetObjectEntry(entryIndex); @@ -2401,12 +2401,12 @@ namespace OpenRCT2::Ui::Windows { // CTRL pressed constexpr auto flag = EnumsToFlags( - ViewportInteractionItem::Terrain, ViewportInteractionItem::Ride, ViewportInteractionItem::Scenery, - ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, - ViewportInteractionItem::LargeScenery); + ViewportInteractionItem::terrain, ViewportInteractionItem::ride, ViewportInteractionItem::scenery, + ViewportInteractionItem::footpath, ViewportInteractionItem::wall, + ViewportInteractionItem::largeScenery); auto info = GetMapCoordinatesFromPos(screenPos, flag); - if (info.interactionType != ViewportInteractionItem::None) + if (info.interactionType != ViewportInteractionItem::none) { gSceneryCtrlPressed = true; gSceneryCtrlPressZ = info.Element->GetBaseZ(); @@ -2579,12 +2579,12 @@ namespace OpenRCT2::Ui::Windows // If CTRL not pressed if (!gSceneryCtrlPressed) { - constexpr auto flag = EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water); + constexpr auto flag = EnumsToFlags(ViewportInteractionItem::terrain, ViewportInteractionItem::water); auto info = GetMapCoordinatesFromPos(screenPos, flag); gridPos = info.Loc; - if (info.interactionType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::none) { gridPos.SetNull(); return; @@ -2674,11 +2674,11 @@ namespace OpenRCT2::Ui::Windows Sub6E1F34UpdateScreenCoordsAndButtonsPressed(false, screenPos); // Path bits - constexpr auto flag = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::PathAddition); + constexpr auto flag = EnumsToFlags(ViewportInteractionItem::footpath, ViewportInteractionItem::pathAddition); auto info = GetMapCoordinatesFromPos(screenPos, flag); gridPos = info.Loc; - if (info.interactionType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::none) { gridPos.SetNull(); return; @@ -2901,11 +2901,11 @@ namespace OpenRCT2::Ui::Windows Sub6E1F34UpdateScreenCoordsAndButtonsPressed(false, screenPos); // Banner - constexpr auto flag = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::PathAddition); + constexpr auto flag = EnumsToFlags(ViewportInteractionItem::footpath, ViewportInteractionItem::pathAddition); auto info = GetMapCoordinatesFromPos(screenPos, flag); gridPos = info.Loc; - if (info.interactionType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::none) { gridPos.SetNull(); return; diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 03351fd131..7df806881b 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -679,7 +679,7 @@ namespace OpenRCT2::Ui::Windows gPickupPeepImage = ImageId(); auto info = GetMapCoordinatesFromPos(screenCoords, kViewportInteractionItemAll); - if (info.interactionType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::none) return; gPickupPeepX = screenCoords.x - 1; diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 7340262e3d..b542162c46 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -466,9 +466,9 @@ namespace OpenRCT2::Ui::Windows }; static constexpr int32_t ViewportInteractionFlags = EnumsToFlags( - ViewportInteractionItem::Terrain, ViewportInteractionItem::Ride, ViewportInteractionItem::Scenery, - ViewportInteractionItem::Footpath, ViewportInteractionItem::PathAddition, ViewportInteractionItem::ParkEntrance, - ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery, ViewportInteractionItem::Banner); + ViewportInteractionItem::terrain, ViewportInteractionItem::ride, ViewportInteractionItem::scenery, + ViewportInteractionItem::footpath, ViewportInteractionItem::pathAddition, ViewportInteractionItem::parkEntrance, + ViewportInteractionItem::wall, ViewportInteractionItem::largeScenery, ViewportInteractionItem::banner); // clang-format off static uint64_t PageHoldDownWidgets[] = { diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 4b972c015a..772fc390d4 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -117,7 +117,7 @@ namespace OpenRCT2::Ui::Windows void OnClose() override { ClearProvisional(); - ViewportSetVisibility(ViewportVisibility::Default); + ViewportSetVisibility(ViewportVisibility::standard); MapInvalidateMapSelectionTiles(); gMapSelectFlags.unset(MapSelectFlag::enableConstruct); gMapSelectFlags.unset(MapSelectFlag::enableArrow); @@ -457,11 +457,11 @@ namespace OpenRCT2::Ui::Windows if (!_trackPlaceCtrlState && im.IsModifierKeyPressed(ModifierKey::ctrl)) { constexpr auto interactionFlags = EnumsToFlags( - ViewportInteractionItem::Terrain, ViewportInteractionItem::Ride, ViewportInteractionItem::Scenery, - ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery); + ViewportInteractionItem::terrain, ViewportInteractionItem::ride, ViewportInteractionItem::scenery, + ViewportInteractionItem::footpath, ViewportInteractionItem::wall, ViewportInteractionItem::largeScenery); auto info = GetMapCoordinatesFromPos(screenCoords, interactionFlags); - if (info.interactionType == ViewportInteractionItem::Terrain) + if (info.interactionType == ViewportInteractionItem::terrain) { _trackPlaceCtrlZ = floor2(surfaceElement->GetBaseZ(), kCoordsZStep); diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 4e7e10d339..3d274ad7c9 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -328,9 +328,9 @@ namespace OpenRCT2::Ui::Windows gMapSelectFlags.unset(MapSelectFlag::enable); auto info = GetMapCoordinatesFromPos( - screenPos, EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water)); + screenPos, EnumsToFlags(ViewportInteractionItem::terrain, ViewportInteractionItem::water)); - if (info.interactionType == ViewportInteractionItem::None) + if (info.interactionType == ViewportInteractionItem::none) { if (_waterToolRaiseCost != kMoney64Undefined || _waterToolLowerCost != kMoney64Undefined) { diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 943f7a7e24..0c26ae1421 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -301,7 +301,7 @@ namespace OpenRCT2::Drawing::LightFx TileElement* tileElement = nullptr; - ViewportInteractionItem interactionType = ViewportInteractionItem::None; + ViewportInteractionItem interactionType = ViewportInteractionItem::none; // NOTE: When the flag VIEWPORT_FLAG_RENDERING_INHIBITED is set we can not create a paint graph. if ((vp.flags & VIEWPORT_FLAG_RENDERING_INHIBITED) == 0) @@ -335,7 +335,7 @@ namespace OpenRCT2::Drawing::LightFx int32_t minDist = 0; int32_t baseHeight = (-999) * kCoordsZStep; - if (interactionType != ViewportInteractionItem::Entity && tileElement != nullptr) + if (interactionType != ViewportInteractionItem::entity && tileElement != nullptr) { baseHeight = tileElement->GetBaseZ(); } diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index d39ef02078..b0c42198e9 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -691,7 +691,7 @@ static void ConsoleCommandGet(InteractiveConsole& console, const arguments_t& ar { Viewport* viewport = WindowGetViewport(w); auto info = GetMapCoordinatesFromPosWindow( - w, { viewport->width / 2, viewport->height / 2 }, EnumsToFlags(ViewportInteractionItem::Terrain)); + w, { viewport->width / 2, viewport->height / 2 }, EnumsToFlags(ViewportInteractionItem::terrain)); auto tileMapCoord = TileCoordsXY(info.Loc); console.WriteFormatLine("location %d %d", tileMapCoord.x, tileMapCoord.y); diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index f57ac99df8..7bb9c2f5d0 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -1308,7 +1308,7 @@ namespace OpenRCT2 switch (mode) { - case ViewportVisibility::Default: + case ViewportVisibility::standard: { // Set all these flags to 0, and invalidate if any were active uint32_t mask = VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_RIDES | VIEWPORT_FLAG_HIDE_SCENERY | VIEWPORT_FLAG_HIDE_PATHS | VIEWPORT_FLAG_LAND_HEIGHTS | VIEWPORT_FLAG_TRACK_HEIGHTS @@ -1320,19 +1320,19 @@ namespace OpenRCT2 vp->flags &= ~mask; break; } - case ViewportVisibility::UndergroundViewOn: // 6CB79D - case ViewportVisibility::UndergroundViewGhostOn: // 6CB7C4 + case ViewportVisibility::undergroundViewOn: // 6CB79D + case ViewportVisibility::undergroundViewGhostOn: // 6CB7C4 // Set underground on, invalidate if it was off invalidate += !(vp->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE); vp->flags |= VIEWPORT_FLAG_UNDERGROUND_INSIDE; break; - case ViewportVisibility::TrackHeights: // 6CB7EB + case ViewportVisibility::trackHeights: // 6CB7EB // Set track heights on, invalidate if off invalidate += !(vp->flags & VIEWPORT_FLAG_TRACK_HEIGHTS); vp->flags |= VIEWPORT_FLAG_TRACK_HEIGHTS; break; - case ViewportVisibility::UndergroundViewOff: // 6CB7B1 - case ViewportVisibility::UndergroundViewGhostOff: // 6CB7D8 + case ViewportVisibility::undergroundViewOff: // 6CB7B1 + case ViewportVisibility::undergroundViewGhostOff: // 6CB7D8 // Set underground off, invalidate if it was on invalidate += vp->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE; vp->flags &= ~(static_cast(VIEWPORT_FLAG_UNDERGROUND_INSIDE)); @@ -1412,7 +1412,7 @@ namespace OpenRCT2 switch (ps->InteractionItem) { - case ViewportInteractionItem::Entity: + case ViewportInteractionItem::entity: if (ps->Entity != nullptr) { switch (ps->Entity->Type) @@ -1421,8 +1421,8 @@ namespace OpenRCT2 { if (viewFlags & VIEWPORT_FLAG_HIDE_VEHICLES || clipped) { - return (viewFlags & VIEWPORT_FLAG_INVISIBLE_VEHICLES) ? VisibilityKind::Hidden - : VisibilityKind::Partial; + return (viewFlags & VIEWPORT_FLAG_INVISIBLE_VEHICLES) ? VisibilityKind::hidden + : VisibilityKind::partial; } // Rides without track can technically have a 'vehicle': // these should be hidden if 'hide rides' is enabled @@ -1435,8 +1435,8 @@ namespace OpenRCT2 auto ride = vehicle->GetRide(); if (ride != nullptr && !ride->getRideTypeDescriptor().HasFlag(RtdFlag::hasTrack)) { - return (viewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES) ? VisibilityKind::Hidden - : VisibilityKind::Partial; + return (viewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES) ? VisibilityKind::hidden + : VisibilityKind::partial; } } break; @@ -1444,82 +1444,82 @@ namespace OpenRCT2 case EntityType::Guest: if (viewFlags & VIEWPORT_FLAG_HIDE_GUESTS) { - return VisibilityKind::Hidden; + return VisibilityKind::hidden; } else if (clipped) { - return VisibilityKind::Partial; + return VisibilityKind::partial; } break; case EntityType::Staff: if (viewFlags & VIEWPORT_FLAG_HIDE_STAFF) { - return VisibilityKind::Hidden; + return VisibilityKind::hidden; } else if (clipped) { - return VisibilityKind::Partial; + return VisibilityKind::partial; } break; default: if (clipped) { - return VisibilityKind::Partial; + return VisibilityKind::partial; } break; } } break; - case ViewportInteractionItem::Ride: + case ViewportInteractionItem::ride: if (viewFlags & VIEWPORT_FLAG_HIDE_RIDES || clipped) { - return (viewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES) ? VisibilityKind::Hidden : VisibilityKind::Partial; + return (viewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES) ? VisibilityKind::hidden : VisibilityKind::partial; } break; - case ViewportInteractionItem::Footpath: - case ViewportInteractionItem::PathAddition: - case ViewportInteractionItem::Banner: + case ViewportInteractionItem::footpath: + case ViewportInteractionItem::pathAddition: + case ViewportInteractionItem::banner: if (viewFlags & VIEWPORT_FLAG_HIDE_PATHS || clipped) { - return (viewFlags & VIEWPORT_FLAG_INVISIBLE_PATHS) ? VisibilityKind::Hidden : VisibilityKind::Partial; + return (viewFlags & VIEWPORT_FLAG_INVISIBLE_PATHS) ? VisibilityKind::hidden : VisibilityKind::partial; } break; - case ViewportInteractionItem::Scenery: - case ViewportInteractionItem::LargeScenery: - case ViewportInteractionItem::Wall: + case ViewportInteractionItem::scenery: + case ViewportInteractionItem::largeScenery: + case ViewportInteractionItem::wall: if (ps->Element != nullptr) { if (IsTileElementVegetation(ps->Element)) { if (viewFlags & VIEWPORT_FLAG_HIDE_VEGETATION || clipped) { - return (viewFlags & VIEWPORT_FLAG_INVISIBLE_VEGETATION) ? VisibilityKind::Hidden - : VisibilityKind::Partial; + return (viewFlags & VIEWPORT_FLAG_INVISIBLE_VEGETATION) ? VisibilityKind::hidden + : VisibilityKind::partial; } } else { if (viewFlags & VIEWPORT_FLAG_HIDE_SCENERY || clipped) { - return (viewFlags & VIEWPORT_FLAG_INVISIBLE_SCENERY) ? VisibilityKind::Hidden - : VisibilityKind::Partial; + return (viewFlags & VIEWPORT_FLAG_INVISIBLE_SCENERY) ? VisibilityKind::hidden + : VisibilityKind::partial; } } } - if (ps->InteractionItem == ViewportInteractionItem::Wall + if (ps->InteractionItem == ViewportInteractionItem::wall && (viewFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE || clipped)) { - return VisibilityKind::Partial; + return VisibilityKind::partial; } break; default: if (clipped) { - return VisibilityKind::Partial; + return VisibilityKind::partial; } break; } - return VisibilityKind::Visible; + return VisibilityKind::visible; } /** @@ -1527,8 +1527,8 @@ namespace OpenRCT2 */ static bool PSInteractionTypeIsInFilter(PaintStruct* ps, uint16_t filter) { - if (ps->InteractionItem != ViewportInteractionItem::None && ps->InteractionItem != ViewportInteractionItem::Label - && ps->InteractionItem <= ViewportInteractionItem::Banner) + if (ps->InteractionItem != ViewportInteractionItem::none && ps->InteractionItem != ViewportInteractionItem::label + && ps->InteractionItem <= ViewportInteractionItem::banner) { auto mask = EnumToFlag(ps->InteractionItem); if (filter & mask) @@ -1716,7 +1716,7 @@ namespace OpenRCT2 if (IsSpriteInteractedWith(session->DPI, ps->image_id, ps->ScreenPos)) { if (PSInteractionTypeIsInFilter(ps, filter) - && GetPaintStructVisibility(ps, viewFlags) == VisibilityKind::Visible) + && GetPaintStructVisibility(ps, viewFlags) == VisibilityKind::visible) { info = { ps }; } @@ -1731,7 +1731,7 @@ namespace OpenRCT2 if (IsSpriteInteractedWith(session->DPI, attached_ps->image_id, ps->ScreenPos + attached_ps->RelativePos)) { if (PSInteractionTypeIsInFilter(ps, filter) - && GetPaintStructVisibility(ps, viewFlags) == VisibilityKind::Visible) + && GetPaintStructVisibility(ps, viewFlags) == VisibilityKind::visible) { info = { ps }; } @@ -1872,8 +1872,8 @@ namespace OpenRCT2 return std::nullopt; } auto myViewport = window->viewport; - auto info = GetMapCoordinatesFromPosWindow(window, screenCoords, EnumsToFlags(ViewportInteractionItem::Terrain)); - if (info.interactionType == ViewportInteractionItem::None) + auto info = GetMapCoordinatesFromPosWindow(window, screenCoords, EnumsToFlags(ViewportInteractionItem::terrain)); + if (info.interactionType == ViewportInteractionItem::none) { return std::nullopt; } diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index 0d2503e6c6..df2e1ee03e 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -124,36 +124,36 @@ namespace OpenRCT2 enum class VisibilityKind { - Visible, - Partial, - Hidden + visible, + partial, + hidden }; enum class ViewportInteractionItem : uint8_t { - None, - Terrain, - Entity, - Ride, - Water, - Scenery, - Footpath, - PathAddition, - ParkEntrance, - Wall, - LargeScenery, - Label, - Banner + none, + terrain, + entity, + ride, + water, + scenery, + footpath, + pathAddition, + parkEntrance, + wall, + largeScenery, + label, + banner }; enum class ViewportVisibility : uint8_t { - Default = 0, - UndergroundViewOn = 1, - TrackHeights = 2, - UndergroundViewOff = 3, - UndergroundViewGhostOn = 4, - UndergroundViewGhostOff = 5, + standard = 0, + undergroundViewOn = 1, + trackHeights = 2, + undergroundViewOff = 3, + undergroundViewGhostOn = 4, + undergroundViewGhostOff = 5, }; namespace OpenRCT2 @@ -167,7 +167,7 @@ namespace OpenRCT2 CoordsXY Loc; TileElement* Element{}; EntityBase* Entity{}; - ViewportInteractionItem interactionType = ViewportInteractionItem::None; + ViewportInteractionItem interactionType = ViewportInteractionItem::none; }; constexpr int32_t kMaxViewportCount = kWindowLimitMax; diff --git a/src/openrct2/paint/Paint.Entity.cpp b/src/openrct2/paint/Paint.Entity.cpp index ce91548854..6126085b63 100644 --- a/src/openrct2/paint/Paint.Entity.cpp +++ b/src/openrct2/paint/Paint.Entity.cpp @@ -126,7 +126,7 @@ void EntityPaintSetup(PaintSession& session, const CoordsXY& pos) session.CurrentlyDrawnEntity = entity; session.SpritePosition.x = entityPos.x; session.SpritePosition.y = entityPos.y; - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; switch (entity->Type) { diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 5f3e8635c3..8c5285047b 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -705,7 +705,7 @@ static inline void PaintAttachedPS(RenderTarget& rt, PaintStruct* ps, uint32_t v static inline void PaintDrawStruct(PaintSession& session, PaintStruct* ps) { auto screenPos = ps->ScreenPos; - if (ps->InteractionItem == ViewportInteractionItem::Entity) + if (ps->InteractionItem == ViewportInteractionItem::entity) { if (session.DPI.zoom_level >= ZoomLevel{ 1 }) { @@ -845,9 +845,9 @@ static ImageId PaintPSColourifyImage(const PaintStruct* ps, ImageId imageId, uin auto visibility = GetPaintStructVisibility(ps, viewFlags); switch (visibility) { - case VisibilityKind::Partial: + case VisibilityKind::partial: return imageId.WithTransparency(FilterPaletteID::PaletteDarken1); - case VisibilityKind::Hidden: + case VisibilityKind::hidden: return ImageId(); default: return imageId; diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp index 5c1d12cc13..5435dde082 100644 --- a/src/openrct2/paint/Painter.cpp +++ b/src/openrct2/paint/Painter.cpp @@ -186,7 +186,7 @@ PaintSession* Painter::CreateSession(RenderTarget& rt, uint32_t viewFlags, uint8 session->CurrentlyDrawnTileElement = nullptr; session->Surface = nullptr; session->SelectedElement = OpenRCT2::TileInspector::GetSelectedElement(); - session->InteractionType = ViewportInteractionItem::None; + session->InteractionType = ViewportInteractionItem::none; session->PathElementOnSameHeight = nullptr; session->TrackElementOnSameHeight = nullptr; diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index e66eb40170..4e381565bc 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -292,7 +292,7 @@ void VirtualFloorPaint(PaintSession& session) uint8_t direction = session.CurrentRotation; // This is a virtual floor, so no interactions - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; int16_t virtualFloorClipHeight = _virtualFloorHeight; diff --git a/src/openrct2/paint/tile_element/Paint.Banner.cpp b/src/openrct2/paint/tile_element/Paint.Banner.cpp index 5e8fe390e1..4d58e8dd46 100644 --- a/src/openrct2/paint/tile_element/Paint.Banner.cpp +++ b/src/openrct2/paint/tile_element/Paint.Banner.cpp @@ -93,7 +93,7 @@ void PaintBanner(PaintSession& session, uint8_t direction, int32_t height, const return; } - session.InteractionType = ViewportInteractionItem::Banner; + session.InteractionType = ViewportInteractionItem::banner; height -= 16; @@ -103,7 +103,7 @@ void PaintBanner(PaintSession& session, uint8_t direction, int32_t height, const ImageId imageTemplate; if (bannerElement.IsGhost()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); } else if (session.SelectedElement == reinterpret_cast(&bannerElement)) diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index bdf8c3f39c..6972eab4fa 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -135,7 +135,7 @@ static void PaintRideEntranceExit(PaintSession& session, uint8_t direction, int3 return; } - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; PaintRideEntranceExitLightEffects(session, height, entranceEl); @@ -150,7 +150,7 @@ static void PaintRideEntranceExit(PaintSession& session, uint8_t direction, int3 if (entranceEl.IsGhost()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); } else if (session.SelectedElement == reinterpret_cast(&entranceEl)) @@ -284,12 +284,12 @@ static void PaintParkEntrance(PaintSession& session, uint8_t direction, int32_t PaintParkEntranceLightEffects(session); - session.InteractionType = ViewportInteractionItem::ParkEntrance; + session.InteractionType = ViewportInteractionItem::parkEntrance; ImageId imageTemplate; if (entranceEl.IsGhost()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); } else if (session.SelectedElement == reinterpret_cast(&entranceEl)) @@ -371,7 +371,7 @@ void PaintEntrance(PaintSession& session, uint8_t direction, int32_t height, con { PROFILED_FUNCTION(); - session.InteractionType = ViewportInteractionItem::Label; + session.InteractionType = ViewportInteractionItem::label; PaintHeightMarkers(session, entranceElement, height); switch (entranceElement.GetEntranceType()) diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index efeabfcf07..40028affbc 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -351,7 +351,7 @@ void PaintLargeScenery(PaintSession& session, uint8_t direction, uint16_t height auto& tile = sceneryEntry->tiles[sequenceNum]; - session.InteractionType = ViewportInteractionItem::LargeScenery; + session.InteractionType = ViewportInteractionItem::largeScenery; auto isGhost = false; ImageId imageTemplate; @@ -362,7 +362,7 @@ void PaintLargeScenery(PaintSession& session, uint8_t direction, uint16_t height } else if (tileElement.IsGhost()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); isGhost = true; } diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index be6154c482..d2985c501b 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -123,7 +123,7 @@ static void PathPaintQueueBanner( uint8_t direction = pathElement.GetQueueBannerDirection(); // Draw ride sign - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; if (pathElement.IsSloped()) { if (pathElement.GetSlopeDirection() == direction) @@ -183,10 +183,10 @@ static void PathPaintQueueBanner( { 0, 0, height + 7 }, { boundBoxOffsets, { 1, 1, 21 } }); } - session.InteractionType = ViewportInteractionItem::Footpath; + session.InteractionType = ViewportInteractionItem::footpath; if (imageTemplate.IsRemap()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; } } @@ -777,7 +777,7 @@ void PaintPath(PaintSession& session, uint16_t height, const PathElement& tileEl { PROFILED_FUNCTION(); - session.InteractionType = ViewportInteractionItem::Footpath; + session.InteractionType = ViewportInteractionItem::footpath; ImageId imageTemplate, sceneryImageTemplate; if (gTrackDesignSaveMode) @@ -806,7 +806,7 @@ void PaintPath(PaintSession& session, uint16_t height, const PathElement& tileEl if (tileElement.IsGhost()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); } else if (session.SelectedElement == reinterpret_cast(&tileElement)) diff --git a/src/openrct2/paint/tile_element/Paint.PathAddition.cpp b/src/openrct2/paint/tile_element/Paint.PathAddition.cpp index ca4629714e..5b708b0a9a 100644 --- a/src/openrct2/paint/tile_element/Paint.PathAddition.cpp +++ b/src/openrct2/paint/tile_element/Paint.PathAddition.cpp @@ -230,10 +230,10 @@ void Sub6A3F61PathAddition(PaintSession& session, const PathElement& pathElement const auto edges = pathElement.GetEdges() ^ 0b1111; const auto rotatedEdges = ((edges << session.CurrentRotation) & 0xF) | (((edges) << session.CurrentRotation) >> 4); - session.InteractionType = ViewportInteractionItem::PathAddition; + session.InteractionType = ViewportInteractionItem::pathAddition; if (sceneryImageTemplate.IsRemap()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; } auto* pathAddEntry = pathElement.GetAdditionEntry(); @@ -259,12 +259,12 @@ void Sub6A3F61PathAddition(PaintSession& session, const PathElement& pathElement break; } - session.InteractionType = ViewportInteractionItem::Footpath; + session.InteractionType = ViewportInteractionItem::footpath; // Set when the path addition is a ghost. if (sceneryImageTemplate.IsRemap()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; } } diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index 04a8b6c238..b7bf7bbe78 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -339,7 +339,7 @@ void PaintSmallScenery(PaintSession& session, uint8_t direction, int32_t height, return; } - session.InteractionType = ViewportInteractionItem::Scenery; + session.InteractionType = ViewportInteractionItem::scenery; ImageId imageTemplate; if (gTrackDesignSaveMode) { @@ -350,7 +350,7 @@ void PaintSmallScenery(PaintSession& session, uint8_t direction, int32_t height, } if (sceneryElement.IsGhost()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); } else if (session.SelectedElement == reinterpret_cast(&sceneryElement)) diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index 284942c957..6c58d7ef2d 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -931,7 +931,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con { PROFILED_FUNCTION(); - session.InteractionType = ViewportInteractionItem::Terrain; + session.InteractionType = ViewportInteractionItem::terrain; session.Flags |= PaintSessionFlags::PassedSurface; session.Surface = &tileElement; @@ -1235,7 +1235,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con if (waterHeight > 0 && !gTrackDesignSaveMode && !waterGetsClipped) { // Loc6615A9: (water height) - session.InteractionType = ViewportInteractionItem::Water; + session.InteractionType = ViewportInteractionItem::water; const uint16_t localHeight = height + 16; @@ -1270,7 +1270,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con if ((tileElement.GetParkFences()) && !gTrackDesignSaveMode) { // Owned land boundary fences - session.InteractionType = ViewportInteractionItem::ParkEntrance; + session.InteractionType = ViewportInteractionItem::parkEntrance; uint8_t rotatedFences = Numerics::rol4(tileElement.GetParkFences(), rotation); @@ -1333,7 +1333,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con } } - session.InteractionType = ViewportInteractionItem::Terrain; + session.InteractionType = ViewportInteractionItem::terrain; switch (surfaceShape) { diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp index cce5138a8b..388cecc6eb 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.cpp +++ b/src/openrct2/paint/tile_element/Paint.TileElement.cpp @@ -102,7 +102,7 @@ static void BlankTilesPaint(PaintSession& session, int32_t x, int32_t y) session.SpritePosition.x = x; session.SpritePosition.y = y; - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; PaintAddImageAsParent(session, ImageId(SPR_BLANK_TILE), { 0, 0, 16 }, { 32, 32, -1 }); } @@ -174,7 +174,7 @@ static void PaintTileElementBase(PaintSession& session, const CoordsXY& origCoor session.SpritePosition.x = coords.x; session.SpritePosition.y = coords.y; - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; PaintAddImageAsParent(session, imageId, { 0, 0, arrowZ }, { { 0, 0, arrowZ + 18 }, { 32, 32, -1 } }); } diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index 501d251339..639bd5cd82 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -314,7 +314,7 @@ void PaintWall(PaintSession& session, uint8_t direction, int32_t height, const W return; } - session.InteractionType = ViewportInteractionItem::Wall; + session.InteractionType = ViewportInteractionItem::wall; ImageId imageTemplate; if (wallEntry->flags & WALL_SCENERY_HAS_PRIMARY_COLOUR) @@ -344,7 +344,7 @@ void PaintWall(PaintSession& session, uint8_t direction, int32_t height, const W if (wallElement.IsGhost()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); isGhost = true; } diff --git a/src/openrct2/paint/track/gentle/Circus.cpp b/src/openrct2/paint/track/gentle/Circus.cpp index eac97bd5b7..41a84d2802 100644 --- a/src/openrct2/paint/track/gentle/Circus.cpp +++ b/src/openrct2/paint/track/gentle/Circus.cpp @@ -33,7 +33,7 @@ static void PaintCircusTent( auto vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); if (ride.lifecycleFlags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; } @@ -49,7 +49,7 @@ static void PaintCircusTent( { { al + 16, cl + 16, height + 3 }, { 24, 24, 47 } }); session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintCircus( diff --git a/src/openrct2/paint/track/gentle/CrookedHouse.cpp b/src/openrct2/paint/track/gentle/CrookedHouse.cpp index 7ac4621be1..e9c5031e9a 100644 --- a/src/openrct2/paint/track/gentle/CrookedHouse.cpp +++ b/src/openrct2/paint/track/gentle/CrookedHouse.cpp @@ -73,7 +73,7 @@ static void PaintCrookedHouseStructure( auto vehicle = getGameState().entities.GetEntity(ride->vehicles[0]); if (vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; } } diff --git a/src/openrct2/paint/track/gentle/FerrisWheel.cpp b/src/openrct2/paint/track/gentle/FerrisWheel.cpp index f6d5a250de..f3a527d9f1 100644 --- a/src/openrct2/paint/track/gentle/FerrisWheel.cpp +++ b/src/openrct2/paint/track/gentle/FerrisWheel.cpp @@ -73,7 +73,7 @@ static void PaintFerrisWheelStructure( auto vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); if (ride.lifecycleFlags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; } @@ -102,7 +102,7 @@ static void PaintFerrisWheelStructure( PaintAddImageAsChild(session, rightSupportImageId, offset, bb); session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintFerrisWheel( diff --git a/src/openrct2/paint/track/gentle/HauntedHouse.cpp b/src/openrct2/paint/track/gentle/HauntedHouse.cpp index af7e0be60f..a23f569c0b 100644 --- a/src/openrct2/paint/track/gentle/HauntedHouse.cpp +++ b/src/openrct2/paint/track/gentle/HauntedHouse.cpp @@ -42,7 +42,7 @@ static void PaintHauntedHouseStructure( auto vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); if (ride.lifecycleFlags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; frameNum = vehicle->flatRideAnimationFrame; } @@ -63,7 +63,7 @@ static void PaintHauntedHouseStructure( } session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintHauntedHouse( diff --git a/src/openrct2/paint/track/gentle/MerryGoRound.cpp b/src/openrct2/paint/track/gentle/MerryGoRound.cpp index 3bd8e1f49a..dbd185cf2b 100644 --- a/src/openrct2/paint/track/gentle/MerryGoRound.cpp +++ b/src/openrct2/paint/track/gentle/MerryGoRound.cpp @@ -68,7 +68,7 @@ static void PaintCarousel( auto vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); if (ride.lifecycleFlags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; if (ride.lifecycleFlags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN) @@ -103,7 +103,7 @@ static void PaintCarousel( } session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintMerryGoRound( diff --git a/src/openrct2/paint/track/gentle/SpaceRings.cpp b/src/openrct2/paint/track/gentle/SpaceRings.cpp index 5f6e7ba1e4..7577e8b1c6 100644 --- a/src/openrct2/paint/track/gentle/SpaceRings.cpp +++ b/src/openrct2/paint/track/gentle/SpaceRings.cpp @@ -47,7 +47,7 @@ static void PaintSpaceRingsStructure( if (rideEntry == nullptr || (ride.numStations != 0 && vehicleIndex >= ride.numTrains)) { session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; return; } @@ -56,7 +56,7 @@ static void PaintSpaceRingsStructure( auto vehicle = getGameState().entities.GetEntity(ride.vehicles[vehicleIndex]); if (ride.lifecycleFlags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; frameNum += static_cast(vehicle->flatRideAnimationFrame) * 4; } @@ -86,7 +86,7 @@ static void PaintSpaceRingsStructure( } session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } /** rct2: 0x00767C40 */ diff --git a/src/openrct2/paint/track/thrill/3dCinema.cpp b/src/openrct2/paint/track/thrill/3dCinema.cpp index 8e87748987..bd0d1d6021 100644 --- a/src/openrct2/paint/track/thrill/3dCinema.cpp +++ b/src/openrct2/paint/track/thrill/3dCinema.cpp @@ -32,7 +32,7 @@ static void Paint3dCinemaDome( if (ride.lifecycleFlags & RIDE_LIFECYCLE_ON_TRACK && !ride.vehicles[0].IsNull()) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = getGameState().entities.GetEntity(ride.vehicles[0]); } @@ -47,7 +47,7 @@ static void Paint3dCinemaDome( session, imageId, { xOffset, yOffset, height + 3 }, { { xOffset + 16, yOffset + 16, height + 3 }, { 24, 24, 47 } }); session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } /** diff --git a/src/openrct2/paint/track/thrill/Enterprise.cpp b/src/openrct2/paint/track/thrill/Enterprise.cpp index 87d53d33cc..82d4630f48 100644 --- a/src/openrct2/paint/track/thrill/Enterprise.cpp +++ b/src/openrct2/paint/track/thrill/Enterprise.cpp @@ -61,7 +61,7 @@ static void PaintEnterpriseStructure( vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); if (vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; } } @@ -90,7 +90,7 @@ static void PaintEnterpriseStructure( } session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintEnterprise( diff --git a/src/openrct2/paint/track/thrill/MagicCarpet.cpp b/src/openrct2/paint/track/thrill/MagicCarpet.cpp index 21c430997a..203b8a6895 100644 --- a/src/openrct2/paint/track/thrill/MagicCarpet.cpp +++ b/src/openrct2/paint/track/thrill/MagicCarpet.cpp @@ -193,7 +193,7 @@ static void PaintMagicCarpetStructure( if (vehicle != nullptr) { swing = vehicle->flatRideAnimationFrame; - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; } @@ -211,7 +211,7 @@ static void PaintMagicCarpetStructure( PaintMagicCarpetFrame(session, Plane::Front, direction, offset, bb); session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintMagicCarpet( diff --git a/src/openrct2/paint/track/thrill/MotionSimulator.cpp b/src/openrct2/paint/track/thrill/MotionSimulator.cpp index 8918116352..3f527d6f3a 100644 --- a/src/openrct2/paint/track/thrill/MotionSimulator.cpp +++ b/src/openrct2/paint/track/thrill/MotionSimulator.cpp @@ -51,7 +51,7 @@ static void PaintMotionSimulatorVehicle( vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); if (vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; } } @@ -102,7 +102,7 @@ static void PaintMotionSimulatorVehicle( } session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintMotionSimulator( diff --git a/src/openrct2/paint/track/thrill/SwingingInverterShip.cpp b/src/openrct2/paint/track/thrill/SwingingInverterShip.cpp index 9633056c60..8ad8cd8b6a 100644 --- a/src/openrct2/paint/track/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/paint/track/thrill/SwingingInverterShip.cpp @@ -80,7 +80,7 @@ static void PaintSwingingInverterShipStructure( vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); if (vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; } } @@ -125,7 +125,7 @@ static void PaintSwingingInverterShipStructure( } session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintSwingingInverterShip( diff --git a/src/openrct2/paint/track/thrill/SwingingShip.cpp b/src/openrct2/paint/track/thrill/SwingingShip.cpp index 270e0fec4f..4883ef26d1 100644 --- a/src/openrct2/paint/track/thrill/SwingingShip.cpp +++ b/src/openrct2/paint/track/thrill/SwingingShip.cpp @@ -99,7 +99,7 @@ static void PaintSwingingShipStructure( if (ride.lifecycleFlags & RIDE_LIFECYCLE_ON_TRACK && !ride.vehicles[0].IsNull()) { vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; } @@ -151,7 +151,7 @@ static void PaintSwingingShipStructure( PaintAddImageAsChild(session, imageId, offset, bb); session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintSwingingShip( diff --git a/src/openrct2/paint/track/thrill/TopSpin.cpp b/src/openrct2/paint/track/thrill/TopSpin.cpp index da620997a4..e538331fa2 100644 --- a/src/openrct2/paint/track/thrill/TopSpin.cpp +++ b/src/openrct2/paint/track/thrill/TopSpin.cpp @@ -132,7 +132,7 @@ static void PaintTopSpinVehicle( auto* vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); if (ride.lifecycleFlags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr) { - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; armRotation = vehicle->flatRideAnimationFrame; @@ -178,7 +178,7 @@ static void PaintTopSpinVehicle( PaintAddImageAsChild(session, supportImageTemplate.WithIndex(imageIndex), offset, bb); session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } static void PaintTopSpin( diff --git a/src/openrct2/paint/track/thrill/Twist.cpp b/src/openrct2/paint/track/thrill/Twist.cpp index 54f9fc3856..992c1f96da 100644 --- a/src/openrct2/paint/track/thrill/Twist.cpp +++ b/src/openrct2/paint/track/thrill/Twist.cpp @@ -42,7 +42,7 @@ static void PaintTwistStructure( { vehicle = getGameState().entities.GetEntity(ride.vehicles[0]); - session.InteractionType = ViewportInteractionItem::Entity; + session.InteractionType = ViewportInteractionItem::entity; session.CurrentlyDrawnEntity = vehicle; } @@ -81,7 +81,7 @@ static void PaintTwistStructure( } session.CurrentlyDrawnEntity = nullptr; - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; } /** rct2: 0x0076D858 */ diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index f18528225f..cebc468b80 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -616,29 +616,29 @@ static void TrackDesignSaveShouldSelectNearbySceneryForTile(RideId rideIndex, in continue; do { - ViewportInteractionItem interactionType = ViewportInteractionItem::None; + ViewportInteractionItem interactionType = ViewportInteractionItem::none; switch (tileElement->GetType()) { case TileElementType::Path: if (!tileElement->AsPath()->IsQueue()) - interactionType = ViewportInteractionItem::Footpath; + interactionType = ViewportInteractionItem::footpath; else if (tileElement->AsPath()->GetRideIndex() == rideIndex) - interactionType = ViewportInteractionItem::Footpath; + interactionType = ViewportInteractionItem::footpath; break; case TileElementType::SmallScenery: - interactionType = ViewportInteractionItem::Scenery; + interactionType = ViewportInteractionItem::scenery; break; case TileElementType::Wall: - interactionType = ViewportInteractionItem::Wall; + interactionType = ViewportInteractionItem::wall; break; case TileElementType::LargeScenery: - interactionType = ViewportInteractionItem::LargeScenery; + interactionType = ViewportInteractionItem::largeScenery; break; default: break; } - if (interactionType != ViewportInteractionItem::None) + if (interactionType != ViewportInteractionItem::none) { if (!TrackDesignSaveContainsTileElement(tileElement)) { diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 5b87eb03da..1090493b90 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -1976,7 +1976,7 @@ void PaintTrack(PaintSession& session, Direction direction, int32_t height, cons if (PaintShouldShowHeightMarkers(session, VIEWPORT_FLAG_TRACK_HEIGHTS)) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; const auto& ted = GetTrackElementDescriptor(trackType); if (ted.heightMarkerPositions & (1 << trackSequence)) { @@ -2005,7 +2005,7 @@ void PaintTrack(PaintSession& session, Direction direction, int32_t height, cons LightFx::AddShopLights(session.MapPosition, trackElement.GetDirection(), height, zOffset); } - session.InteractionType = ViewportInteractionItem::Ride; + session.InteractionType = ViewportInteractionItem::ride; session.TrackColours = ImageId( 0, ride->trackColours[trackColourScheme].main, ride->trackColours[trackColourScheme].additional); session.SupportColours = ImageId( @@ -2017,7 +2017,7 @@ void PaintTrack(PaintSession& session, Direction direction, int32_t height, cons } if (trackElement.IsGhost()) { - session.InteractionType = ViewportInteractionItem::None; + session.InteractionType = ViewportInteractionItem::none; session.TrackColours = ConstructionMarker; session.SupportColours = ConstructionMarker; }