diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index f1beef04e2..0ef55df415 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -638,10 +638,10 @@ static void ShortcutToggleInvisiblePeeps() auto w = window_get_main(); if (w != nullptr) { - if (w->viewport->flags & VIEWPORT_FLAG_INVISIBLE_GUESTS || w->viewport->flags & VIEWPORT_FLAG_INVISIBLE_STAFF) - w->viewport->flags = w->viewport->flags & ~(VIEWPORT_FLAG_INVISIBLE_GUESTS | VIEWPORT_FLAG_INVISIBLE_STAFF); + if (w->viewport->flags & VIEWPORT_FLAG_HIDE_GUESTS || w->viewport->flags & VIEWPORT_FLAG_HIDE_STAFF) + w->viewport->flags = w->viewport->flags & ~(VIEWPORT_FLAG_HIDE_GUESTS | VIEWPORT_FLAG_HIDE_STAFF); else - w->viewport->flags |= (VIEWPORT_FLAG_INVISIBLE_GUESTS | VIEWPORT_FLAG_INVISIBLE_STAFF); + w->viewport->flags |= (VIEWPORT_FLAG_HIDE_GUESTS | VIEWPORT_FLAG_HIDE_STAFF); w->Invalidate(); } } @@ -654,10 +654,10 @@ static void ShortcutToggleInvisibleSupports() auto w = window_get_main(); if (w != nullptr) { - if ((w->viewport->flags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS) || (w->viewport->flags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)) - w->viewport->flags = w->viewport->flags & ~(VIEWPORT_FLAG_SEETHROUGH_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS); + if ((w->viewport->flags & VIEWPORT_FLAG_HIDE_SUPPORTS) || (w->viewport->flags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)) + w->viewport->flags = w->viewport->flags & ~(VIEWPORT_FLAG_HIDE_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS); else - w->viewport->flags |= (VIEWPORT_FLAG_SEETHROUGH_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS); + w->viewport->flags |= (VIEWPORT_FLAG_HIDE_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS); w->Invalidate(); } } @@ -885,9 +885,9 @@ void ShortcutManager::RegisterDefaultShortcuts() RegisterShortcut(ShortcutId::ViewToggleTransparentWater, STR_VIEWPORT_TRANSPARENT_WATER, "2", []() { ShortcutToggleTransparentWater(); }); RegisterShortcut(ShortcutId::ViewToggleBaseLand, STR_SHORTCUT_REMOVE_BASE_LAND_TOGGLE, "H", []() { ToggleViewFlag(VIEWPORT_FLAG_HIDE_BASE); }); RegisterShortcut(ShortcutId::ViewToggleVerticalLand, STR_SHORTCUT_REMOVE_VERTICAL_LAND_TOGGLE, "V", []() { ToggleViewFlag(VIEWPORT_FLAG_HIDE_VERTICAL); }); - RegisterShortcut(ShortcutId::ViewToggleRides, STR_SHORTCUT_SEE_THROUGH_RIDES_TOGGLE, "3", []() { ToggleViewFlag(VIEWPORT_FLAG_SEETHROUGH_RIDES); }); - RegisterShortcut(ShortcutId::ViewToggleScenery, STR_SHORTCUT_SEE_THROUGH_SCENERY_TOGGLE, "4", []() { ToggleViewFlag(VIEWPORT_FLAG_SEETHROUGH_SCENERY); }); - RegisterShortcut(ShortcutId::ViewToggleFootpaths, STR_SHORTCUT_SEE_THROUGH_PATHS_TOGGLE, []() { ToggleViewFlag(VIEWPORT_FLAG_SEETHROUGH_PATHS); }); + RegisterShortcut(ShortcutId::ViewToggleRides, STR_SHORTCUT_SEE_THROUGH_RIDES_TOGGLE, "3", []() { ToggleViewFlag(VIEWPORT_FLAG_HIDE_RIDES); }); + RegisterShortcut(ShortcutId::ViewToggleScenery, STR_SHORTCUT_SEE_THROUGH_SCENERY_TOGGLE, "4", []() { ToggleViewFlag(VIEWPORT_FLAG_HIDE_SCENERY); }); + RegisterShortcut(ShortcutId::ViewToggleFootpaths, STR_SHORTCUT_SEE_THROUGH_PATHS_TOGGLE, []() { ToggleViewFlag(VIEWPORT_FLAG_HIDE_PATHS); }); RegisterShortcut(ShortcutId::ViewToggleSupports, STR_SHORTCUT_INVISIBLE_SUPPORTS_TOGGLE, "5", []() { ShortcutToggleInvisibleSupports(); }); RegisterShortcut(ShortcutId::ViewTogglePeeps, STR_SHORTCUT_INVISIBLE_PEOPLE_TOGGLE, "6", []() { ShortcutToggleInvisiblePeeps(); }); RegisterShortcut(ShortcutId::ViewToggleLandHeightMarkers, STR_SHORTCUT_HEIGHT_MARKS_ON_LAND_TOGGLE, "8", []() { ToggleViewFlag(VIEWPORT_FLAG_LAND_HEIGHTS); }); diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 42232072d5..7b65b6dc1c 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -745,9 +745,9 @@ static Peep* ViewportInteractionGetClosestPeep(ScreenCoordsXY screenCoords, int3 auto viewportCoords = viewport->ScreenToViewportCoord(screenCoords); PeepDistance goal; - if (!(viewport->flags & VIEWPORT_FLAG_INVISIBLE_GUESTS)) + if (!(viewport->flags & VIEWPORT_FLAG_HIDE_GUESTS)) goal = GetClosestPeep(viewportCoords, maxDistance, goal); - if (!(viewport->flags & VIEWPORT_FLAG_INVISIBLE_STAFF)) + if (!(viewport->flags & VIEWPORT_FLAG_HIDE_STAFF)) goal = GetClosestPeep(viewportCoords, maxDistance, goal); return goal.peep; } diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 50e732c0bb..fd153d0b1d 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -3659,15 +3659,15 @@ static void TopToolbarInitViewMenu(rct_window* w, rct_widget* widget) Dropdown::SetChecked(DDIDX_HIDE_BASE, true); if (mainViewport->flags & VIEWPORT_FLAG_HIDE_VERTICAL) Dropdown::SetChecked(DDIDX_HIDE_VERTICAL, true); - if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_RIDES) + if (mainViewport->flags & VIEWPORT_FLAG_HIDE_RIDES) Dropdown::SetChecked(DDIDX_SEETHROUGH_RIDES, true); - if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_SCENERY) + if (mainViewport->flags & VIEWPORT_FLAG_HIDE_SCENERY) Dropdown::SetChecked(DDIDX_SEETHROUGH_SCENERY, true); - if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_PATHS) + if (mainViewport->flags & VIEWPORT_FLAG_HIDE_PATHS) Dropdown::SetChecked(DDIDX_SEETHROUGH_PATHS, true); - if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS) + if (mainViewport->flags & VIEWPORT_FLAG_HIDE_SUPPORTS) Dropdown::SetChecked(DDIDX_INVISIBLE_SUPPORTS, true); - if (mainViewport->flags & VIEWPORT_FLAG_INVISIBLE_GUESTS || mainViewport->flags & VIEWPORT_FLAG_INVISIBLE_STAFF) + if (mainViewport->flags & VIEWPORT_FLAG_HIDE_GUESTS || mainViewport->flags & VIEWPORT_FLAG_HIDE_STAFF) Dropdown::SetChecked(DDIDX_INVISIBLE_PEEPS, true); if (mainViewport->flags & VIEWPORT_FLAG_LAND_HEIGHTS) Dropdown::SetChecked(DDIDX_LAND_HEIGHTS, true); @@ -3714,26 +3714,26 @@ static void TopToolbarViewMenuDropdown(int16_t dropdownIndex) w->viewport->flags ^= VIEWPORT_FLAG_HIDE_VERTICAL; break; case DDIDX_SEETHROUGH_RIDES: - w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_RIDES; + w->viewport->flags ^= VIEWPORT_FLAG_HIDE_RIDES; break; case DDIDX_SEETHROUGH_SCENERY: - w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_SCENERY; + w->viewport->flags ^= VIEWPORT_FLAG_HIDE_SCENERY; break; case DDIDX_SEETHROUGH_PATHS: - w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_PATHS; + w->viewport->flags ^= VIEWPORT_FLAG_HIDE_PATHS; break; case DDIDX_INVISIBLE_SUPPORTS: - if (w->viewport->flags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS) + if (w->viewport->flags & VIEWPORT_FLAG_HIDE_SUPPORTS) w->viewport->flags = w->viewport->flags - & ~(VIEWPORT_FLAG_SEETHROUGH_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS); + & ~(VIEWPORT_FLAG_HIDE_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS); else - w->viewport->flags |= (VIEWPORT_FLAG_SEETHROUGH_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS); + w->viewport->flags |= (VIEWPORT_FLAG_HIDE_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS); break; case DDIDX_INVISIBLE_PEEPS: - if (w->viewport->flags & VIEWPORT_FLAG_INVISIBLE_GUESTS || w->viewport->flags & VIEWPORT_FLAG_INVISIBLE_STAFF) - w->viewport->flags = w->viewport->flags & ~(VIEWPORT_FLAG_INVISIBLE_GUESTS | VIEWPORT_FLAG_INVISIBLE_STAFF); + if (w->viewport->flags & VIEWPORT_FLAG_HIDE_GUESTS || w->viewport->flags & VIEWPORT_FLAG_HIDE_STAFF) + w->viewport->flags = w->viewport->flags & ~(VIEWPORT_FLAG_HIDE_GUESTS | VIEWPORT_FLAG_HIDE_STAFF); else - w->viewport->flags |= (VIEWPORT_FLAG_INVISIBLE_GUESTS | VIEWPORT_FLAG_INVISIBLE_STAFF); + w->viewport->flags |= (VIEWPORT_FLAG_HIDE_GUESTS | VIEWPORT_FLAG_HIDE_STAFF); break; case DDIDX_LAND_HEIGHTS: w->viewport->flags ^= VIEWPORT_FLAG_LAND_HEIGHTS; diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index 0cdc3c011d..54975c0e2f 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -124,20 +124,20 @@ public: if (w != nullptr) wflags = w->viewport->flags; - SetWidgetPressed(WIDX_SEE_THROUGH_RIDES, (wflags & VIEWPORT_FLAG_SEETHROUGH_RIDES)); - SetWidgetPressed(WIDX_SEE_THROUGH_VEHICLES, (wflags & VIEWPORT_FLAG_SEETHROUGH_VEHICLES)); - SetWidgetPressed(WIDX_SEE_THROUGH_SCENERY, (wflags & VIEWPORT_FLAG_SEETHROUGH_SCENERY)); - SetWidgetPressed(WIDX_SEE_THROUGH_TREES, (wflags & VIEWPORT_FLAG_SEETHROUGH_TREES)); - SetWidgetPressed(WIDX_SEE_THROUGH_PATHS, (wflags & VIEWPORT_FLAG_SEETHROUGH_PATHS)); - SetWidgetPressed(WIDX_SEE_THROUGH_SUPPORTS, (wflags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS)); + SetWidgetPressed(WIDX_SEE_THROUGH_RIDES, (wflags & VIEWPORT_FLAG_HIDE_RIDES)); + SetWidgetPressed(WIDX_SEE_THROUGH_VEHICLES, (wflags & VIEWPORT_FLAG_HIDE_VEHICLES)); + SetWidgetPressed(WIDX_SEE_THROUGH_SCENERY, (wflags & VIEWPORT_FLAG_HIDE_SCENERY)); + SetWidgetPressed(WIDX_SEE_THROUGH_TREES, (wflags & VIEWPORT_FLAG_HIDE_TREES)); + SetWidgetPressed(WIDX_SEE_THROUGH_PATHS, (wflags & VIEWPORT_FLAG_HIDE_PATHS)); + SetWidgetPressed(WIDX_SEE_THROUGH_SUPPORTS, (wflags & VIEWPORT_FLAG_HIDE_SUPPORTS)); SetWidgetPressed(WIDX_INVISIBLE_RIDES, (wflags & VIEWPORT_FLAG_INVISIBLE_RIDES)); SetWidgetPressed(WIDX_INVISIBLE_VEHICLES, (wflags & VIEWPORT_FLAG_INVISIBLE_VEHICLES)); SetWidgetPressed(WIDX_INVISIBLE_SCENERY, (wflags & VIEWPORT_FLAG_INVISIBLE_SCENERY)); SetWidgetPressed(WIDX_INVISIBLE_TREES, (wflags & VIEWPORT_FLAG_INVISIBLE_TREES)); SetWidgetPressed(WIDX_INVISIBLE_PATHS, (wflags & VIEWPORT_FLAG_INVISIBLE_PATHS)); SetWidgetPressed(WIDX_INVISIBLE_SUPPORTS, (wflags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)); - SetWidgetPressed(WIDX_INVISIBLE_GUESTS, (wflags & VIEWPORT_FLAG_INVISIBLE_GUESTS)); - SetWidgetPressed(WIDX_INVISIBLE_STAFF, (wflags & VIEWPORT_FLAG_INVISIBLE_STAFF)); + SetWidgetPressed(WIDX_INVISIBLE_GUESTS, (wflags & VIEWPORT_FLAG_HIDE_GUESTS)); + SetWidgetPressed(WIDX_INVISIBLE_STAFF, (wflags & VIEWPORT_FLAG_HIDE_STAFF)); } void OnDraw(rct_drawpixelinfo& dpi) override @@ -164,22 +164,22 @@ private: switch (widgetIndex) { case WIDX_SEE_THROUGH_RIDES: - wflags ^= VIEWPORT_FLAG_SEETHROUGH_RIDES; + wflags ^= VIEWPORT_FLAG_HIDE_RIDES; break; case WIDX_SEE_THROUGH_VEHICLES: - wflags ^= VIEWPORT_FLAG_SEETHROUGH_VEHICLES; + wflags ^= VIEWPORT_FLAG_HIDE_VEHICLES; break; case WIDX_SEE_THROUGH_SCENERY: - wflags ^= VIEWPORT_FLAG_SEETHROUGH_SCENERY; + wflags ^= VIEWPORT_FLAG_HIDE_SCENERY; break; case WIDX_SEE_THROUGH_TREES: - wflags ^= VIEWPORT_FLAG_SEETHROUGH_TREES; + wflags ^= VIEWPORT_FLAG_HIDE_TREES; break; case WIDX_SEE_THROUGH_PATHS: - wflags ^= VIEWPORT_FLAG_SEETHROUGH_PATHS; + wflags ^= VIEWPORT_FLAG_HIDE_PATHS; break; case WIDX_SEE_THROUGH_SUPPORTS: - wflags ^= VIEWPORT_FLAG_SEETHROUGH_SUPPORTS; + wflags ^= VIEWPORT_FLAG_HIDE_SUPPORTS; break; case WIDX_INVISIBLE_RIDES: wflags ^= VIEWPORT_FLAG_INVISIBLE_RIDES; @@ -200,10 +200,10 @@ private: wflags ^= VIEWPORT_FLAG_INVISIBLE_SUPPORTS; break; case WIDX_INVISIBLE_GUESTS: - wflags ^= VIEWPORT_FLAG_INVISIBLE_GUESTS; + wflags ^= VIEWPORT_FLAG_HIDE_GUESTS; break; case WIDX_INVISIBLE_STAFF: - wflags ^= VIEWPORT_FLAG_INVISIBLE_STAFF; + wflags ^= VIEWPORT_FLAG_HIDE_STAFF; break; default: return; diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index b45a84ccee..fa580604d8 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -564,12 +564,12 @@ static void ApplyOptions(const ScreenshotOptions* options, rct_viewport& viewpor if (options->hide_guests) { - viewport.flags |= VIEWPORT_FLAG_INVISIBLE_GUESTS | VIEWPORT_FLAG_INVISIBLE_STAFF; + viewport.flags |= VIEWPORT_FLAG_HIDE_GUESTS | VIEWPORT_FLAG_HIDE_STAFF; } if (options->hide_sprites) { - viewport.flags |= VIEWPORT_FLAG_INVISIBLE_SPRITES; + viewport.flags |= VIEWPORT_FLAG_HIDE_ENTITIES; } if (options->mowed_grass) diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 68286f8295..6bc6c36d2e 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -924,7 +924,7 @@ static void viewport_paint_column(paint_session& session) && (~session.ViewFlags & VIEWPORT_FLAG_TRANSPARENT_BACKGROUND)) { uint8_t colour = COLOUR_AQUAMARINE; - if (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES) + if (session.ViewFlags & VIEWPORT_FLAG_HIDE_ENTITIES) { colour = COLOUR_BLACK; } @@ -933,7 +933,7 @@ static void viewport_paint_column(paint_session& session) PaintDrawStructs(session); - if (gConfigGeneral.render_weather_gloom && !gTrackDesignSaveMode && !(session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES) + if (gConfigGeneral.render_weather_gloom && !gTrackDesignSaveMode && !(session.ViewFlags & VIEWPORT_FLAG_HIDE_ENTITIES) && !(session.ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)) { viewport_paint_weather_gloom(&session.DPI); @@ -1318,13 +1318,13 @@ void viewport_set_visibility(uint8_t mode) { case 0: { // Set all these flags to 0, and invalidate if any were active - uint32_t mask = VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_SEETHROUGH_RIDES - | VIEWPORT_FLAG_SEETHROUGH_SCENERY | VIEWPORT_FLAG_SEETHROUGH_PATHS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS - | VIEWPORT_FLAG_LAND_HEIGHTS | VIEWPORT_FLAG_TRACK_HEIGHTS | VIEWPORT_FLAG_PATH_HEIGHTS - | VIEWPORT_FLAG_INVISIBLE_GUESTS | VIEWPORT_FLAG_INVISIBLE_STAFF | VIEWPORT_FLAG_HIDE_BASE - | VIEWPORT_FLAG_HIDE_VERTICAL | VIEWPORT_FLAG_SEETHROUGH_VEHICLES | VIEWPORT_FLAG_INVISIBLE_RIDES - | VIEWPORT_FLAG_INVISIBLE_VEHICLES | VIEWPORT_FLAG_SEETHROUGH_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_PATHS - | VIEWPORT_FLAG_INVISIBLE_SCENERY | VIEWPORT_FLAG_SEETHROUGH_TREES | VIEWPORT_FLAG_INVISIBLE_TREES; + uint32_t mask = VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_RIDES | VIEWPORT_FLAG_HIDE_SCENERY + | VIEWPORT_FLAG_HIDE_PATHS | VIEWPORT_FLAG_INVISIBLE_SUPPORTS | VIEWPORT_FLAG_LAND_HEIGHTS + | VIEWPORT_FLAG_TRACK_HEIGHTS | VIEWPORT_FLAG_PATH_HEIGHTS | VIEWPORT_FLAG_HIDE_GUESTS + | VIEWPORT_FLAG_HIDE_STAFF | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_HIDE_VERTICAL + | VIEWPORT_FLAG_HIDE_VEHICLES | VIEWPORT_FLAG_INVISIBLE_RIDES | VIEWPORT_FLAG_INVISIBLE_VEHICLES + | VIEWPORT_FLAG_HIDE_SUPPORTS | VIEWPORT_FLAG_INVISIBLE_PATHS | VIEWPORT_FLAG_INVISIBLE_SCENERY + | VIEWPORT_FLAG_HIDE_TREES | VIEWPORT_FLAG_INVISIBLE_TREES; invalidate += vp->flags & mask; vp->flags &= ~mask; @@ -1377,20 +1377,20 @@ VisibilityKind GetPaintStructVisibility(const paint_struct* ps, uint32_t viewFla switch (ps->entity->Type) { case EntityType::Vehicle: - if (viewFlags & VIEWPORT_FLAG_SEETHROUGH_VEHICLES) + if (viewFlags & VIEWPORT_FLAG_HIDE_VEHICLES) { return (viewFlags & VIEWPORT_FLAG_INVISIBLE_VEHICLES) ? VisibilityKind::Hidden : VisibilityKind::Partial; } break; case EntityType::Guest: - if (viewFlags & VIEWPORT_FLAG_INVISIBLE_GUESTS) + if (viewFlags & VIEWPORT_FLAG_HIDE_GUESTS) { return VisibilityKind::Hidden; } break; case EntityType::Staff: - if (viewFlags & VIEWPORT_FLAG_INVISIBLE_STAFF) + if (viewFlags & VIEWPORT_FLAG_HIDE_STAFF) { return VisibilityKind::Hidden; } @@ -1399,7 +1399,7 @@ VisibilityKind GetPaintStructVisibility(const paint_struct* ps, uint32_t viewFla } break; case ViewportInteractionItem::Ride: - if (viewFlags & VIEWPORT_FLAG_SEETHROUGH_RIDES) + if (viewFlags & VIEWPORT_FLAG_HIDE_RIDES) { return (viewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES) ? VisibilityKind::Hidden : VisibilityKind::Partial; } @@ -1407,7 +1407,7 @@ VisibilityKind GetPaintStructVisibility(const paint_struct* ps, uint32_t viewFla case ViewportInteractionItem::Footpath: case ViewportInteractionItem::FootpathItem: case ViewportInteractionItem::Banner: - if (viewFlags & VIEWPORT_FLAG_SEETHROUGH_PATHS) + if (viewFlags & VIEWPORT_FLAG_HIDE_PATHS) { return (viewFlags & VIEWPORT_FLAG_INVISIBLE_PATHS) ? VisibilityKind::Hidden : VisibilityKind::Partial; } @@ -1415,18 +1415,18 @@ VisibilityKind GetPaintStructVisibility(const paint_struct* ps, uint32_t viewFla case ViewportInteractionItem::Scenery: if (ps->tileElement != nullptr && IsTileElementTree(ps->tileElement)) { - if (viewFlags & VIEWPORT_FLAG_SEETHROUGH_TREES) + if (viewFlags & VIEWPORT_FLAG_HIDE_TREES) { return (viewFlags & VIEWPORT_FLAG_INVISIBLE_TREES) ? VisibilityKind::Hidden : VisibilityKind::Partial; } } - else if (viewFlags & VIEWPORT_FLAG_SEETHROUGH_SCENERY) + else if (viewFlags & VIEWPORT_FLAG_HIDE_SCENERY) { return (viewFlags & VIEWPORT_FLAG_INVISIBLE_SCENERY) ? VisibilityKind::Hidden : VisibilityKind::Partial; } break; case ViewportInteractionItem::Wall: - if (viewFlags & VIEWPORT_FLAG_SEETHROUGH_SCENERY) + if (viewFlags & VIEWPORT_FLAG_HIDE_SCENERY) { return (viewFlags & VIEWPORT_FLAG_INVISIBLE_SCENERY) ? VisibilityKind::Hidden : VisibilityKind::Partial; } @@ -1436,7 +1436,7 @@ VisibilityKind GetPaintStructVisibility(const paint_struct* ps, uint32_t viewFla } break; case ViewportInteractionItem::LargeScenery: - if (viewFlags & VIEWPORT_FLAG_SEETHROUGH_SCENERY) + if (viewFlags & VIEWPORT_FLAG_HIDE_SCENERY) { return (viewFlags & VIEWPORT_FLAG_INVISIBLE_SCENERY) ? VisibilityKind::Hidden : VisibilityKind::Partial; } diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index 64b1477bf0..afdebef75c 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -29,35 +29,38 @@ struct paint_entry; enum { - VIEWPORT_FLAG_UNDERGROUND_INSIDE = (1 << 0), - VIEWPORT_FLAG_SEETHROUGH_RIDES = (1 << 1), - VIEWPORT_FLAG_SEETHROUGH_SCENERY = (1 << 2), - VIEWPORT_FLAG_INVISIBLE_SUPPORTS = (1 << 3), - VIEWPORT_FLAG_LAND_HEIGHTS = (1 << 4), - VIEWPORT_FLAG_TRACK_HEIGHTS = (1 << 5), - VIEWPORT_FLAG_PATH_HEIGHTS = (1 << 6), - VIEWPORT_FLAG_GRIDLINES = (1 << 7), - VIEWPORT_FLAG_LAND_OWNERSHIP = (1 << 8), - VIEWPORT_FLAG_CONSTRUCTION_RIGHTS = (1 << 9), - VIEWPORT_FLAG_SOUND_ON = (1 << 10), - VIEWPORT_FLAG_HIDE_BASE = (1 << 12), - VIEWPORT_FLAG_HIDE_VERTICAL = (1 << 13), - VIEWPORT_FLAG_INVISIBLE_SPRITES = (1 << 14), - VIEWPORT_FLAG_15 = (1 << 15), - VIEWPORT_FLAG_SEETHROUGH_PATHS = (1 << 16), - VIEWPORT_FLAG_CLIP_VIEW = (1 << 17), - VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES = (1 << 18), - VIEWPORT_FLAG_TRANSPARENT_BACKGROUND = (1 << 19), - VIEWPORT_FLAG_SEETHROUGH_VEHICLES = (1 << 20), - VIEWPORT_FLAG_INVISIBLE_VEHICLES = (1 << 21), - VIEWPORT_FLAG_INVISIBLE_RIDES = (1 << 22), - VIEWPORT_FLAG_INVISIBLE_SCENERY = (1 << 23), - VIEWPORT_FLAG_INVISIBLE_PATHS = (1 << 24), - VIEWPORT_FLAG_INVISIBLE_GUESTS = (1 << 25), - VIEWPORT_FLAG_INVISIBLE_STAFF = (1 << 26), - VIEWPORT_FLAG_SEETHROUGH_TREES = (1 << 27), - VIEWPORT_FLAG_INVISIBLE_TREES = (1 << 28), - VIEWPORT_FLAG_SEETHROUGH_SUPPORTS = (1 << 29), + VIEWPORT_FLAG_GRIDLINES = (1 << 0), + VIEWPORT_FLAG_UNDERGROUND_INSIDE = (1 << 1), + VIEWPORT_FLAG_HIDE_BASE = (1 << 2), + VIEWPORT_FLAG_HIDE_VERTICAL = (1 << 3), + + VIEWPORT_FLAG_SOUND_ON = (1 << 4), + VIEWPORT_FLAG_LAND_OWNERSHIP = (1 << 5), + VIEWPORT_FLAG_CONSTRUCTION_RIGHTS = (1 << 6), + VIEWPORT_FLAG_HIDE_ENTITIES = (1 << 7), + VIEWPORT_FLAG_CLIP_VIEW = (1 << 8), + VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES = (1 << 9), + VIEWPORT_FLAG_TRANSPARENT_BACKGROUND = (1 << 10), + + VIEWPORT_FLAG_LAND_HEIGHTS = (1 << 12), + VIEWPORT_FLAG_TRACK_HEIGHTS = (1 << 13), + VIEWPORT_FLAG_PATH_HEIGHTS = (1 << 14), + + VIEWPORT_FLAG_HIDE_RIDES = (1 << 16), + VIEWPORT_FLAG_HIDE_VEHICLES = (1 << 17), + VIEWPORT_FLAG_HIDE_TREES = (1 << 18), + VIEWPORT_FLAG_HIDE_SCENERY = (1 << 19), + VIEWPORT_FLAG_HIDE_PATHS = (1 << 20), + VIEWPORT_FLAG_HIDE_SUPPORTS = (1 << 21), + VIEWPORT_FLAG_HIDE_GUESTS = (1 << 22), + VIEWPORT_FLAG_HIDE_STAFF = (1 << 23), + + VIEWPORT_FLAG_INVISIBLE_RIDES = (1 << 24), + VIEWPORT_FLAG_INVISIBLE_VEHICLES = (1 << 25), + VIEWPORT_FLAG_INVISIBLE_TREES = (1 << 26), + VIEWPORT_FLAG_INVISIBLE_SCENERY = (1 << 27), + VIEWPORT_FLAG_INVISIBLE_PATHS = (1 << 28), + VIEWPORT_FLAG_INVISIBLE_SUPPORTS = (1 << 29), }; enum class VisibilityKind diff --git a/src/openrct2/paint/Paint.Entity.cpp b/src/openrct2/paint/Paint.Entity.cpp index ebe828793e..f30d45957e 100644 --- a/src/openrct2/paint/Paint.Entity.cpp +++ b/src/openrct2/paint/Paint.Entity.cpp @@ -42,7 +42,7 @@ void EntityPaintSetup(paint_session& session, const CoordsXY& pos) { return; } - if (gTrackDesignSaveMode || (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES)) + if (gTrackDesignSaveMode || (session.ViewFlags & VIEWPORT_FLAG_HIDE_ENTITIES)) { return; } diff --git a/src/openrct2/paint/Supports.cpp b/src/openrct2/paint/Supports.cpp index 9a409c7105..53e6ce29f4 100644 --- a/src/openrct2/paint/Supports.cpp +++ b/src/openrct2/paint/Supports.cpp @@ -481,7 +481,7 @@ bool wooden_a_supports_paint_setup( return false; } - if (session.ViewFlags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS) + if (session.ViewFlags & VIEWPORT_FLAG_HIDE_SUPPORTS) { if (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) { @@ -642,7 +642,7 @@ bool wooden_b_supports_paint_setup( return false; } - if (session.ViewFlags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS) + if (session.ViewFlags & VIEWPORT_FLAG_HIDE_SUPPORTS) { if (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) { @@ -816,7 +816,7 @@ bool metal_a_supports_paint_setup( return false; } - if (session.ViewFlags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS) + if (session.ViewFlags & VIEWPORT_FLAG_HIDE_SUPPORTS) { if (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) { @@ -1019,7 +1019,7 @@ bool metal_b_supports_paint_setup( return false; // AND } - if (session.ViewFlags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS) + if (session.ViewFlags & VIEWPORT_FLAG_HIDE_SUPPORTS) { if (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) { @@ -1203,7 +1203,7 @@ bool path_a_supports_paint_setup( return false; } - if (session.ViewFlags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS) + if (session.ViewFlags & VIEWPORT_FLAG_HIDE_SUPPORTS) { if (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) { @@ -1357,7 +1357,7 @@ bool path_b_supports_paint_setup( return false; } - if (session.ViewFlags & VIEWPORT_FLAG_SEETHROUGH_SUPPORTS) + if (session.ViewFlags & VIEWPORT_FLAG_HIDE_SUPPORTS) { if (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) { diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 06331ccb80..03a2e48f73 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -2115,7 +2115,7 @@ void TrackDesignDrawPreview(TrackDesign* td6, uint8_t* pixels) view.view_height = size_y; view.pos = { 0, 0 }; view.zoom = zoom_level; - view.flags = VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_INVISIBLE_SPRITES; + view.flags = VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_HIDE_ENTITIES; rct_drawpixelinfo dpi; dpi.zoom_level = zoom_level;