Misc. clean ups

Define see-through paint colours in Paint.h for global use Color staff sprite button Change ride->is_visible bool to ignore_invisible_flag bool Add shortcut to open transparency options (CTRL+T)
2026-01-15 11:03:00 +01:00 · 2021-08-14 00:54:16 +10:00
parent 9bf003c018
commit 3d3271a5ec
10 changed files with 76 additions and 149 deletions
--- a/data/language/en-GB.txt
+++ b/data/language/en-GB.txt
@@ -3669,11 +3669,10 @@ STR_6477    :Invisible Guests
 STR_6478    :Invisible Staff
 STR_6479    :Transparency Options
 STR_6480    :Transparency Options
-STR_6481    :Transparency Options
-STR_6482    :Ride Exclusions
-STR_6483    :Other Options
-STR_6484    :Invisible Vehicles
-STR_6485    :See-Through Supports
+STR_6481    :Invisible Vehicles
+STR_6482    :See-Through Supports
+STR_6483    :Open transparency options
+STR_6484    :Ride Exclusions

 #############
 # Scenarios #
--- a/src/openrct2-ui/input/ShortcutIds.h
+++ b/src/openrct2-ui/input/ShortcutIds.h
@@ -52,6 +52,7 @@ namespace OpenRCT2::Ui::ShortcutId
    constexpr std::string_view InterfaceOpenMessages = "interface.open.messages";
    constexpr std::string_view InterfaceOpenMap = "interface.open.map";
    constexpr std::string_view InterfaceShowOptions = "interface.open.options";
+    constexpr std::string_view InterfaceOpenTransparencyOptions = "interface.open.transparency_options";
    constexpr std::string_view InterfaceOpenCheats = "interface.open.cheats";
    constexpr std::string_view InterfaceOpenTileInspector = "interface.open.tileinspector";
    constexpr std::string_view MultiplayerShow = "interface.open.multiplayer";
--- a/src/openrct2-ui/input/Shortcuts.cpp
+++ b/src/openrct2-ui/input/Shortcuts.cpp
@@ -391,6 +391,14 @@ static void ShortcutOpenCheatWindow()
    context_open_window(WC_CHEATS);
 }

+static void ShortcutOpenTransparencyWindow()
+{
+    if (gScreenFlags != SCREEN_FLAGS_PLAYING)
+        return;
+
+    context_open_window(WC_TRANSPARENCY);
+}
+
 static void ShortcutClearScenery()
 {
    if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
@@ -833,6 +841,7 @@ void ShortcutManager::RegisterDefaultShortcuts()
    RegisterShortcut(ShortcutId::InterfaceSceneryPicker, STR_SHORTCUT_OPEN_SCENERY_PICKER, []() { ShortcutOpenSceneryPicker(); });

    RegisterShortcut(ShortcutId::InterfaceShowOptions, STR_SHORTCUT_SHOW_OPTIONS, []() { context_open_window(WC_OPTIONS); });
+    RegisterShortcut(ShortcutId::InterfaceOpenTransparencyOptions, STR_SHORTCUT_OPEN_TRANSPARENCY_OPTIONS, "CTRL+T", []() { ShortcutOpenTransparencyWindow(); });
    RegisterShortcut(ShortcutId::InterfaceOpenCheats, STR_SHORTCUT_OPEN_CHEATS_WINDOW, "CTRL+ALT+C", []() { ShortcutOpenCheatWindow(); });
    RegisterShortcut(ShortcutId::InterfaceOpenMap, STR_SHORTCUT_SHOW_MAP, "TAB", []() { ShortcutShowMap(); });
    RegisterShortcut(ShortcutId::InterfaceClearScenery, STR_SHORTCUT_CLEAR_SCENERY, "B", []() { ShortcutClearScenery(); });
--- a/src/openrct2-ui/windows/Transparency.cpp
+++ b/src/openrct2-ui/windows/Transparency.cpp
@@ -22,6 +22,7 @@
 #include <openrct2/localisation/Date.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/network/network.h>
+#include <openrct2/peep/Staff.h>
 #include <openrct2/sprites.h>
 #include <openrct2/util/Util.h>
 #include <openrct2/world/Climate.h>
@@ -33,7 +34,6 @@ enum
 {
    WINDOW_TRANSPARENCY_PAGE_MAIN,
    WINDOW_TRANSPARENCY_PAGE_RIDES,
-    WINDOW_TRANSPARENCY_PAGE_MISC,
    WINDOW_TRANSPARENCY_PAGE_COUNT,
 };

@@ -63,51 +63,44 @@ enum WINDOW_TRANSPARENCY_WIDGET_IDX
    WIDX_INVISIBLE_SUPPORTS,

    WIDX_LIST = WIDX_TAB_CONTENT,
-
-    WIDX_MISC_GROUP = WIDX_TAB_CONTENT,
 };

 #pragma region MEASUREMENTS

 static constexpr const rct_string_id WINDOW_TITLE = STR_TRANSPARENCY_OPTIONS_TITLE;
-static constexpr const int32_t WW = 249;
-static constexpr const int32_t WH = 300;
+static constexpr const int32_t WW = 203;
+static constexpr const int32_t WH = 70;

 static constexpr ScreenSize ICON_BUTTON = {24, 24};
 static constexpr ScreenSize FLAT_BUTTON = {24, 12};

-static constexpr const int32_t TAB_WIDTH = 31;
-static constexpr const int32_t TAB_START = 3;
-
-
 #pragma endregion

 #define MAIN_TRANSPARENCY_WIDGETS \
    WINDOW_SHIM(WINDOW_TITLE, WW, WH), \
-    MakeWidget({ 0, 81}, {WW, 257}, WindowWidgetType::ImgBtn, WindowColour::Secondary), /* tab content panel */ \
-    MakeTab   ({ 3, 55}, STR_TRANSPARENCY_OPTIONS_TITLE_MAIN), /* tab 1 */ \
-    MakeTab   ({34, 55}, STR_TRANSPARENCY_OPTIONS_TITLE_RIDE)
+    MakeWidget({  0,  0}, {  0,  0},      WindowWidgetType::ImgBtn,   WindowColour::Secondary), /* tab content panel */ \
+    MakeWidget({189, 42}, { 12,  6},      WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_TRANSPARENCY_OPTIONS_TITLE), \
+    MakeWidget({189, 48}, { 12,  6},      WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_TRANSPARENCY_OPTIONS_TITLE_RIDE)

-// 15px group padding top, 17px margin between lines, 17px group padding bottom. 22px group margin bottom
 static rct_widget window_transparency_main_widgets[] =
 {
    MAIN_TRANSPARENCY_WIDGETS,
    
-    MakeWidget({102, 15}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_RIDE,                       STR_SEE_THROUGH_RIDES),
-    MakeWidget({127, 15}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_COASTER_TRAIN,    STR_SEE_THROUGH_VEHICLES),
-    MakeWidget({ 27, 15}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_LARGE_SCENERY,    STR_SEE_THROUGH_SCENERY),
-    MakeWidget({  2, 15}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_TREES,            STR_SEE_THROUGH_TREES),
-    MakeWidget({ 52, 15}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_FOOTPATH,         STR_SEE_THROUGH_PATHS),
-    MakeWidget({ 77, 15}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_SUPPORTS,         STR_SEE_THROUGH_SUPPORTS),
-    MakeWidget({152, 15}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_GUESTS,                     STR_INVISIBLE_GUESTS),
-    MakeWidget({177, 15}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_MECHANIC,                   STR_INVISIBLE_STAFF), // TODO: Color clothing in sprite
+    MakeWidget({ 77, 17}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_RIDE,                       STR_SEE_THROUGH_RIDES),
+    MakeWidget({102, 17}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_COASTER_TRAIN,    STR_SEE_THROUGH_VEHICLES),
+    MakeWidget({ 27, 17}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_LARGE_SCENERY,    STR_SEE_THROUGH_SCENERY),
+    MakeWidget({  2, 17}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_TREES,            STR_SEE_THROUGH_TREES),
+    MakeWidget({ 52, 17}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_FOOTPATH,         STR_SEE_THROUGH_PATHS),
+    MakeWidget({127, 17}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_G2_BUTTON_SUPPORTS,         STR_SEE_THROUGH_SUPPORTS),
+    MakeWidget({152, 17}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, SPR_GUESTS,                     STR_INVISIBLE_GUESTS),
+    MakeWidget({177, 17}, ICON_BUTTON,    WindowWidgetType::ImgBtn,   WindowColour::Secondary, 0xFFFFFFFF,                     STR_INVISIBLE_STAFF),

-    MakeWidget({102,  40}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_RIDES),
-    MakeWidget({127,  40}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_VEHICLES),
-    MakeWidget({ 27,  40}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_SCENERY),
-    MakeWidget({  2,  40}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_TREES),
-    MakeWidget({ 52,  40}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_PATHS),
-    MakeWidget({ 77,  40}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_SUPPORTS),
+    MakeWidget({ 77,  42}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_RIDES),
+    MakeWidget({102,  42}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_VEHICLES),
+    MakeWidget({ 27,  42}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_SCENERY),
+    MakeWidget({  2,  42}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_TREES),
+    MakeWidget({ 52,  42}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_PATHS),
+    MakeWidget({127,  42}, FLAT_BUTTON,   WindowWidgetType::Button,   WindowColour::Tertiary,  STR_NONE,                       STR_INVISIBLE_SUPPORTS),

    { WIDGETS_END },
 };
@@ -115,7 +108,7 @@ static rct_widget window_transparency_main_widgets[] =
 static rct_widget window_transparency_rides_widgets[] =
 {
    MAIN_TRANSPARENCY_WIDGETS,
-    MakeWidget({  4, 95}, {160, 120}, WindowWidgetType::Scroll,       WindowColour::Secondary, SCROLL_VERTICAL),
+    MakeWidget({  2, 17}, {160, 200},     WindowWidgetType::Scroll,   WindowColour::Secondary, SCROLL_VERTICAL),
    { WIDGETS_END },
 };

@@ -145,23 +138,12 @@ static uint64_t window_transparency_page_enabled_widgets[] = {
    (1ULL << WIDX_SEE_THROUGH_SUPPORTS),

    MAIN_TRANSPARENCY_ENABLED_WIDGETS |
-    (1ULL << WIDX_LIST),
-
-    MAIN_TRANSPARENCY_ENABLED_WIDGETS |
-    (1ULL << WIDX_MISC_GROUP)
-};
-static uint64_t window_transparency_page_disabled_widgets[] = {
-    0,
-};
-
-static uint64_t window_transparency_page_hold_down_widgets[] = {
-        0,
+    (1ULL << WIDX_LIST)
 };

 static rct_string_id window_transparency_page_titles[] = {
-    STR_TRANSPARENCY_OPTIONS_TITLE_MAIN,
-    STR_TRANSPARENCY_OPTIONS_TITLE_RIDE,
-    STR_TRANSPARENCY_OPTIONS_TITLE_MISC,
+    STR_TRANSPARENCY_OPTIONS_TITLE,
+    STR_TRANSPARENCY_OPTIONS_TITLE_RIDE
 };
 // clang-format on

@@ -175,20 +157,19 @@ public:
    void OnOpen() override
    {
        SetPage(WINDOW_TRANSPARENCY_PAGE_MAIN);
+
+        auto* w = window_get_main();
+        if (w != nullptr)
+            windowPos.x = ((w->width / 2) - (width / 2));
+
        RefreshRideList();
    }

    void OnUpdate() override
    {
-        frame_no++;
        InvalidateWidget(WIDX_TAB_1 + page);
    }

-    void OnMouseDown(rct_widgetindex widgetIndex) override
-    {
-        // switch (page)
-    }
-
    void OnMouseUp(rct_widgetindex widgetIndex) override
    {
        switch (widgetIndex)
@@ -206,41 +187,30 @@ public:
                    case WINDOW_TRANSPARENCY_PAGE_MAIN:
                        OnMouseUpMain(widgetIndex);
                        break;
-                    case WINDOW_TRANSPARENCY_PAGE_RIDES:
-                        OnMouseUpRides(widgetIndex);
-                        break;
-                    case WINDOW_TRANSPARENCY_PAGE_MISC:
-                        OnMouseUpMisc(widgetIndex);
-                        break;
                }
                break;
        }
    }

-    void OnDropdown(rct_widgetindex widgetIndex, int32_t selectedIndex) override
-    {
-    }
-
-    void OnMouseUpRides(rct_widgetindex widgetIndex)
-    {
-    }
-
    void OnScrollMouseDown(int32_t scrollIndex, const ScreenCoordsXY& screenCoords) override
    {
-        auto i = screenCoords.y / SCROLLABLE_ROW_HEIGHT;
-        // i += static_cast<int32_t>(_selectedPage * GUESTS_PER_PAGE);
-        for (const auto& rideItem : _rideList)
+        if (page == WINDOW_TRANSPARENCY_PAGE_RIDES)
        {
-            if (i == 0)
+            auto i = screenCoords.y / SCROLLABLE_ROW_HEIGHT;
+            // i += static_cast<int32_t>(_selectedPage * GUESTS_PER_PAGE);
+            for (const auto& rideItem : _rideList)
            {
-                auto ridec = get_ride(rideItem);
-                if (ridec != nullptr)
+                if (i == 0)
                {
-                    ridec->is_visible = (ridec->is_visible == true ? false : true);
+                    auto ridec = get_ride(rideItem);
+                    if (ridec != nullptr)
+                    {
+                        ridec->ignore_invisible_flag = (ridec->ignore_invisible_flag == true ? false : true);
+                    }
+                    break;
                }
-                break;
+                i--;
            }
-            i--;
        }
    }

@@ -286,20 +256,22 @@ public:
                SetWidgetPressed(WIDX_INVISIBLE_GUESTS, (w->viewport->flags & VIEWPORT_FLAG_INVISIBLE_GUESTS));
                SetWidgetPressed(WIDX_INVISIBLE_STAFF, (w->viewport->flags & VIEWPORT_FLAG_INVISIBLE_STAFF));
                break;
-            case WINDOW_TRANSPARENCY_PAGE_MISC:
-                break;
        }
    }

    void OnDraw(rct_drawpixelinfo& dpi) override
    {
-        UpdateTabPositions();
        DrawWidgets(dpi);
-        DrawTabImages(dpi);
-    }

-    void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
-    {
+        if (page == WINDOW_TRANSPARENCY_PAGE_MAIN)
+        {
+            // Locate mechanic button image
+            rct_widget* widget = &widgets[WIDX_INVISIBLE_STAFF];
+            auto screenCoords = windowPos + ScreenCoordsXY{ widget->left, widget->top };
+            gfx_draw_sprite(
+                &dpi, (gStaffMechanicColour << 24) | IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS | SPR_MECHANIC, screenCoords,
+                0);
+        }
    }

    OpenRCT2String OnTooltip(rct_widgetindex widgetIndex, rct_string_id fallback) override
@@ -311,10 +283,7 @@ private:
    void SetPage(int32_t p)
    {
        page = p;
-        frame_no = 0;
-
        enabled_widgets = window_transparency_page_enabled_widgets[p];
-        hold_down_widgets = window_transparency_page_hold_down_widgets[p];
        pressed_widgets = 0;
        widgets = window_transparency_page_widgets[p];

@@ -325,7 +294,7 @@ private:
            maxY = std::max<int32_t>(maxY, widget->bottom);
            widget++;
        }
-        maxY += 6;
+        maxY += 4;

        Invalidate();
        height = maxY;
@@ -334,47 +303,6 @@ private:
        Invalidate();
    }

-    void UpdateTabPositions()
-    {
-        constexpr const uint16_t tabs[] = {
-            WIDX_TAB_1,
-            WIDX_TAB_2,
-        };
-
-        auto left = TAB_START;
-        for (auto tab : tabs)
-        {
-            widgets[tab].left = left;
-            if (!IsWidgetDisabled(tab))
-            {
-                left += TAB_WIDTH;
-            }
-        }
-    }
-
-    void DrawTabImages(rct_drawpixelinfo& dpi)
-    {
-        // Main tab
-        if (!IsWidgetDisabled(WIDX_TAB_1))
-        {
-            uint32_t sprite_idx = SPR_TAB_FINANCES_SUMMARY_0;
-            if (page == WINDOW_TRANSPARENCY_PAGE_MAIN)
-                sprite_idx += (frame_no / 2) % 8;
-            gfx_draw_sprite(
-                &dpi, ImageId(sprite_idx), windowPos + ScreenCoordsXY{ widgets[WIDX_TAB_1].left, widgets[WIDX_TAB_1].top });
-        }
-
-        // Rides tab
-        if (!IsWidgetDisabled(WIDX_TAB_2))
-        {
-            uint32_t sprite_idx = SPR_TAB_RIDE_0;
-            if (page == WINDOW_TRANSPARENCY_PAGE_RIDES)
-                sprite_idx += (frame_no / 4) % 16;
-            gfx_draw_sprite(
-                &dpi, ImageId(sprite_idx), windowPos + ScreenCoordsXY{ widgets[WIDX_TAB_2].left, widgets[WIDX_TAB_2].top });
-        }
-    }
-
    void OnMouseUpMain(rct_widgetindex widgetIndex)
    {
        rct_window* w = window_get_main();
@@ -429,14 +357,6 @@ private:
        w->Invalidate();
    }

-    void OnMouseUpMisc(rct_widgetindex widgetIndex)
-    {
-    }
-
-    void OnDropdownMisc(rct_widgetindex widgetIndex, int32_t dropdownIndex)
-    {
-    }
-
    void OnScrollDraw(int32_t scrollIndex, rct_drawpixelinfo& dpi) override
    {
        ScreenCoordsXY screenCoords;
@@ -454,7 +374,7 @@ private:
                gfx_fill_rect_inset(&dpi, { { 2, screenCoords.y }, { 11, screenCoords.y + 10 } }, bgColour, INSET_RECT_F_E0);

                // Draw checkmark
-                if (ridec->is_visible == true)
+                if (ridec->ignore_invisible_flag == true)
                {
                    screenCoords.x = 2;
                    FontSpriteBase fontSpriteBase = FontSpriteBase::MEDIUM_DARK;
@@ -498,8 +418,7 @@ rct_window* WindowTransparencyOpen()
 {
    auto* window = window_bring_to_front_by_class(WC_TRANSPARENCY);
    if (window == nullptr)
-    {
        window = WindowCreate<TransparencyWindow>(WC_TRANSPARENCY, ScreenCoordsXY(32, 32), WW, WH);
-    }
+
    return window;
 }
--- a/src/openrct2/localisation/StringIds.h
+++ b/src/openrct2/localisation/StringIds.h
@@ -3938,11 +3938,10 @@ enum : uint16_t
    STR_INVISIBLE_STAFF = 6478,
    STR_TRANSPARENCY_OPTIONS = 6479,
    STR_TRANSPARENCY_OPTIONS_TITLE = 6480,
-    STR_TRANSPARENCY_OPTIONS_TITLE_MAIN = 6481,
-    STR_TRANSPARENCY_OPTIONS_TITLE_RIDE = 6482,
-    STR_TRANSPARENCY_OPTIONS_TITLE_MISC = 6483,
-    STR_INVISIBLE_VEHICLES = 6484,
-    STR_SEE_THROUGH_SUPPORTS = 6485,
+    STR_INVISIBLE_VEHICLES = 6481,
+    STR_SEE_THROUGH_SUPPORTS = 6482,
+    STR_SHORTCUT_OPEN_TRANSPARENCY_OPTIONS = 6483,
+    STR_TRANSPARENCY_OPTIONS_TITLE_RIDE = 6484,

    // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
    /* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings
--- a/src/openrct2/paint/Paint.Entity.cpp
+++ b/src/openrct2/paint/Paint.Entity.cpp
@@ -79,7 +79,7 @@ void EntityPaintSetup(paint_session& session, const CoordsXY& pos)
            if (veh != nullptr)
            {
                auto ride = get_ride(veh->ride);
-                if (ride != nullptr && !ride->is_visible)
+                if (ride != nullptr && !ride->ignore_invisible_flag)
                    return;
            }
        }
--- a/src/openrct2/paint/Paint.cpp
+++ b/src/openrct2/paint/Paint.cpp
@@ -684,7 +684,7 @@ static ImageId PaintPSColourifyImage(ImageId imageId, ViewportInteractionItem sp
            return seeThrough;
        }
    }
-    if (viewFlags & VIEWPORT_FLAG_SEETHROUGH_VEHICLES)
+    if (viewFlags & VIEWPORT_FLAG_SEETHROUGH_VEHICLES && !(viewFlags & VIEWPORT_FLAG_INVISIBLE_VEHICLES))
    {
        if (spriteType == ViewportInteractionItem::Entity && entityType == EntityType::Vehicle)
        {
--- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
@@ -126,7 +126,7 @@ static void PaintRideEntranceExit(paint_session& session, uint8_t direction, int
    }
    
    if ((session->ViewFlags & VIEWPORT_FLAG_SEETHROUGH_RIDES && session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES)
-        && ride->is_visible == false)
+        && ride->ignore_invisible_flag == false)
        return;

    auto stationObj = ride->GetStationObject();
--- a/src/openrct2/ride/Ride.h
+++ b/src/openrct2/ride/Ride.h
@@ -287,7 +287,7 @@ public:
    uint16_t inversions;
    uint16_t holes;
    uint8_t sheltered_eighths;
-    bool is_visible = false;
+    bool ignore_invisible_flag = false;

    std::unique_ptr<RideMeasurement> measurement;

--- a/src/openrct2/ride/TrackPaint.cpp
+++ b/src/openrct2/ride/TrackPaint.cpp
@@ -2196,7 +2196,7 @@ void PaintTrack(paint_session& session, Direction direction, int32_t height, con
    }

    if ((session->ViewFlags & VIEWPORT_FLAG_SEETHROUGH_RIDES && session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES)
-        && ride->is_visible == false)
+        && ride->ignore_invisible_flag == false)
        return;

    if ((!gTrackDesignSaveMode || rideIndex == gTrackDesignSaveRideIndex)