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

Move WindowFind functions into WindowManager (#23517)

Browse Source 
* Move WindowFind* functions into WindowManager

* Update parameter documentation where applicable
This commit is contained in:
Aaron van Geffen
2025-01-08 21:12:11 +01:00
committed by GitHub
parent a8ef595248
commit aa45247f21
58 changed files with 657 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/Editor.cpp
View File

@@ -324,15 +324,17 @@ namespace OpenRCT2::Editor
return;
}
auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
switch (GetGameState().EditorStep)
{
case EditorStep::ObjectSelection:
if (WindowFindByClass(WindowClass::EditorObjectSelection) != nullptr)
if (windowMgr->FindByClass(WindowClass::EditorObjectSelection) != nullptr)
{
return;
}
if (WindowFindByClass(WindowClass::InstallTrack) != nullptr)
if (windowMgr->FindByClass(WindowClass::InstallTrack) != nullptr)
{
return;
}
@@ -345,7 +347,7 @@ namespace OpenRCT2::Editor
ContextOpenWindow(WindowClass::EditorObjectSelection);
break;
case EditorStep::InventionsListSetUp:
if (WindowFindByClass(WindowClass::EditorInventionList) != nullptr)
if (windowMgr->FindByClass(WindowClass::EditorInventionList) != nullptr)
{
return;
}
@@ -353,7 +355,7 @@ namespace OpenRCT2::Editor
ContextOpenWindow(WindowClass::EditorInventionList);
break;
case EditorStep::OptionsSelection:
if (WindowFindByClass(WindowClass::EditorScenarioOptions) != nullptr)
if (windowMgr->FindByClass(WindowClass::EditorScenarioOptions) != nullptr)
{
return;
}
@@ -361,7 +363,7 @@ namespace OpenRCT2::Editor
ContextOpenWindow(WindowClass::EditorScenarioOptions);
break;
case EditorStep::ObjectiveSelection:
if (WindowFindByClass(WindowClass::EditorObjectiveOptions) != nullptr)
if (windowMgr->FindByClass(WindowClass::EditorObjectiveOptions) != nullptr)
{
return;
}