mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Make WindowView into strong enum

Browse Source
This commit is contained in:
Gymnasiast
2025-09-17 23:49:17 +02:00
parent ea5fc03dd0
commit 472e048f69
19 changed files with 66 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/openrct2-ui/WindowManager.cpp
View File

@@ -70,7 +70,7 @@ public:
case WindowClass::bottomToolbar:
return GameBottomToolbarOpen();
case WindowClass::changelog:
return OpenView(WV_CHANGELOG);
return openView(WindowView::changelog);
case WindowClass::cheats:
return CheatsOpen();
case WindowClass::clearScenery:
@@ -167,39 +167,39 @@ public:
}
}
WindowBase* OpenView(uint8_t view) override
WindowBase* openView(WindowView view) override
{
switch (view)
{
case WV_PARK_AWARDS:
case WindowView::parkAwards:
return ParkAwardsOpen();
case WV_PARK_RATING:
case WindowView::parkRating:
return ParkRatingOpen();
case WV_PARK_OBJECTIVE:
case WindowView::parkObjective:
return ParkObjectiveOpen();
case WV_PARK_GUESTS:
case WindowView::parkGuests:
return ParkGuestsOpen();
case WV_FINANCES_RESEARCH:
case WindowView::financesResearch:
return FinancesResearchOpen();
case WV_RIDE_RESEARCH:
case WindowView::rideResearch:
if (Config::Get().interface.ToolbarShowResearch)
{
return this->OpenWindow(WindowClass::research);
}
return NewRideOpenResearch();
case WV_MAZE_CONSTRUCTION:
case WindowView::mazeConstruction:
return MazeConstructionOpen();
case WV_NETWORK_PASSWORD:
case WindowView::networkPassword:
return NetworkStatusOpenPassword();
case WV_EDITOR_BOTTOM_TOOLBAR:
case WindowView::editorBottomToolbar:
return EditorBottomToolbarOpen();
case WV_CHANGELOG:
return ChangelogOpen(WV_CHANGELOG);
case WV_NEW_VERSION_INFO:
return ChangelogOpen(WV_NEW_VERSION_INFO);
case WV_CONTRIBUTORS:
return ChangelogOpen(WV_CONTRIBUTORS);
case WV_FINANCE_MARKETING:
case WindowView::changelog:
return ChangelogOpen(WindowView::changelog);
case WindowView::newVersionInfo:
return ChangelogOpen(WindowView::newVersionInfo);
case WindowView::contributors:
return ChangelogOpen(WindowView::contributors);
case WindowView::financeMarketing:
return FinancesMarketingOpen();
default:
return nullptr;