mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 18:25:16 +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

21
src/openrct2-ui/windows/Map.cpp
View File

@@ -31,6 +31,8 @@
#include <openrct2/ride/TrainManager.h>
#include <openrct2/ride/Vehicle.h>
#include <openrct2/sprites.h>
#include <openrct2/ui/UiContext.h>
#include <openrct2/ui/WindowManager.h>
#include <openrct2/world/Footpath.h>
#include <openrct2/world/Scenery.h>
#include <openrct2/world/tile_element/EntranceElement.h>
@@ -275,6 +277,7 @@ namespace OpenRCT2::Ui::Windows
void OnMouseUp(WidgetIndex widgetIndex) override
{
auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
switch (widgetIndex)
{
case WIDX_CLOSE:
@@ -282,7 +285,7 @@ namespace OpenRCT2::Ui::Windows
break;
case WIDX_SET_LAND_RIGHTS:
{
if (!WindowFindByClass(WindowClass::LandRights))
if (!windowMgr->FindByClass(WindowClass::LandRights))
ContextOpenWindow(WindowClass::LandRights);
else
WindowCloseByClass(WindowClass::LandRights);
@@ -290,7 +293,7 @@ namespace OpenRCT2::Ui::Windows
}
case WIDX_BUILD_PARK_ENTRANCE:
{
if (!WindowFindByClass(WindowClass::EditorParkEntrance))
if (!windowMgr->FindByClass(WindowClass::EditorParkEntrance))
ContextOpenWindow(WindowClass::EditorParkEntrance);
else
WindowCloseByClass(WindowClass::EditorParkEntrance);
@@ -354,6 +357,8 @@ namespace OpenRCT2::Ui::Windows
void OnUpdate() override
{
auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
// the flickering frequency is reduced by 4, compared to the original
// it was done due to inability to reproduce original frequency
// and decision that the original one looks too fast
@@ -362,12 +367,12 @@ namespace OpenRCT2::Ui::Windows
// Handle guest map flashing
_flashingFlags &= ~MapFlashingFlags::FlashGuests;
if (WindowFindByClass(WindowClass::GuestList) != nullptr)
if (windowMgr->FindByClass(WindowClass::GuestList) != nullptr)
_flashingFlags |= MapFlashingFlags::FlashGuests;
// Handle staff map flashing
_flashingFlags &= ~MapFlashingFlags::FlashStaff;
if (WindowFindByClass(WindowClass::StaffList) != nullptr)
if (windowMgr->FindByClass(WindowClass::StaffList) != nullptr)
_flashingFlags |= MapFlashingFlags::FlashStaff;
if (GetCurrentRotation() != _rotation)
@@ -596,18 +601,20 @@ namespace OpenRCT2::Ui::Windows
void OnPrepareDraw() override
{
auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
// Set the pressed widgets
pressed_widgets = 0;
SetWidgetPressed(WIDX_MAP_SIZE_LINK, _mapWidthAndHeightLinked);
pressed_widgets |= (1uLL << (WIDX_PEOPLE_TAB + selected_tab));
if (WindowFindByClass(WindowClass::EditorParkEntrance))
if (windowMgr->FindByClass(WindowClass::EditorParkEntrance))
pressed_widgets |= (1uLL << WIDX_BUILD_PARK_ENTRANCE);
if (WindowFindByClass(WindowClass::LandRights))
if (windowMgr->FindByClass(WindowClass::LandRights))
pressed_widgets |= (1uLL << WIDX_SET_LAND_RIGHTS);
if (WindowFindByClass(WindowClass::Mapgen))
if (windowMgr->FindByClass(WindowClass::Mapgen))
pressed_widgets |= (1uLL << WIDX_MAP_GENERATOR);
// Set disabled widgets