From 24f5675cabd51ed9aa600244d159ae90ebf2b468 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sun, 10 Mar 2024 18:48:06 +0100 Subject: [PATCH] Remove WindowBase::IsLegacy() function (#21572) --- src/openrct2-ui/interface/Window.cpp | 10 +--------- src/openrct2-ui/interface/Window.h | 1 - src/openrct2/interface/Window_internal.h | 5 ----- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 006d09f793..b594080f9a 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -638,10 +638,7 @@ void WindowDrawWidgets(WindowBase& w, DrawPixelInfo& dpi) { if (w.windowPos.y + widget->top < dpi.y + dpi.height && w.windowPos.y + widget->bottom >= dpi.y) { - if (w.IsLegacy()) - WidgetDraw(dpi, w, widgetIndex); - else - w.OnDrawWidget(widgetIndex, dpi); + w.OnDrawWidget(widgetIndex, dpi); } } } @@ -691,11 +688,6 @@ void InvalidateAllWindowsAfterInput() }); } -bool Window::IsLegacy() -{ - return false; -} - void Window::OnDraw(DrawPixelInfo& dpi) { WindowDrawWidgets(*this, dpi); diff --git a/src/openrct2-ui/interface/Window.h b/src/openrct2-ui/interface/Window.h index 4bc771e920..0356e779e7 100644 --- a/src/openrct2-ui/interface/Window.h +++ b/src/openrct2-ui/interface/Window.h @@ -14,7 +14,6 @@ struct Window : WindowBase { - virtual bool IsLegacy() override; virtual void OnDraw(DrawPixelInfo& dpi) override; virtual void OnDrawWidget(WidgetIndex widgetIndex, DrawPixelInfo& dpi) override; diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h index 2a1e3ffd9a..fd2a3b8cd0 100644 --- a/src/openrct2/interface/Window_internal.h +++ b/src/openrct2/interface/Window_internal.h @@ -80,11 +80,6 @@ struct WindowBase WindowBase& operator=(const WindowBase&) = delete; - virtual bool IsLegacy() - { - return true; - } - // Events virtual void OnOpen() {