mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Move WindowCreate and WindowFocusOrCreate into WindowManager (#23643)

Browse Source 
* Move WindowBringToFront into WindowManager

* Move WindowCreate and WindowFocusOrCreate into WindowManager

* Cut back on Context/UiContext includes
This commit is contained in:
Aaron van Geffen
2025-01-19 10:58:28 +01:00
committed by GitHub
parent 66ede938f8
commit bed4d5bdca
113 changed files with 895 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2-ui/windows/Sign.cpp
View File

@@ -23,6 +23,7 @@
#include <openrct2/object/ObjectEntryManager.h>
#include <openrct2/object/WallSceneryEntry.h>
#include <openrct2/sprites.h>
#include <openrct2/ui/WindowManager.h>
#include <openrct2/world/Banner.h>
#include <openrct2/world/Scenery.h>
#include <openrct2/world/tile_element/LargeSceneryElement.h>
@@ -334,12 +335,13 @@ namespace OpenRCT2::Ui::Windows
*/
WindowBase* SignOpen(rct_windownumber number)
{
auto* w = static_cast<SignWindow*>(WindowBringToFrontByNumber(WindowClass::Banner, number));
auto* windowMgr = GetWindowManager();
auto* w = static_cast<SignWindow*>(windowMgr->BringToFrontByNumber(WindowClass::Banner, number));
if (w != nullptr)
return w;
w = WindowCreate<SignWindow>(WindowClass::Banner, WW, WH, 0);
w = windowMgr->Create<SignWindow>(WindowClass::Banner, WW, WH, 0);
if (w == nullptr)
return nullptr;
@@ -357,12 +359,13 @@ namespace OpenRCT2::Ui::Windows
*/
WindowBase* SignSmallOpen(rct_windownumber number)
{
auto* w = static_cast<SignWindow*>(WindowBringToFrontByNumber(WindowClass::Banner, number));
auto* windowMgr = GetWindowManager();
auto* w = static_cast<SignWindow*>(windowMgr->BringToFrontByNumber(WindowClass::Banner, number));
if (w != nullptr)
return w;
w = WindowCreate<SignWindow>(WindowClass::Banner, WW, WH, 0);
w = windowMgr->Create<SignWindow>(WindowClass::Banner, WW, WH, 0);
if (w == nullptr)
return nullptr;