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

Introduce Config namespace and struct

Browse Source
This commit is contained in:
Aaron van Geffen
2024-05-10 12:10:21 +02:00
parent 9e206d5528
commit a63d86c488
101 changed files with 1162 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/interface/Window.cpp
View File

@@ -191,10 +191,10 @@ static void WindowCloseSurplus(int32_t cap, WindowClass avoid_classification)
*/
void WindowSetWindowLimit(int32_t value)
{
int32_t prev = gConfigGeneral.WindowLimit;
int32_t prev = Config::Get().general.WindowLimit;
int32_t val = std::clamp<int32_t>(value, kWindowLimitMin, kWindowLimitMax);
gConfigGeneral.WindowLimit = val;
ConfigSaveDefault();
Config::Get().general.WindowLimit = val;
Config::Save();
// Checks if value decreases and then closes surplus
// windows if one sets a limit lower than the number of windows open
if (val < prev)
@@ -966,7 +966,7 @@ void WindowZoomSet(WindowBase& w, ZoomLevel zoomLevel, bool atCursor)
int32_t saved_map_y = 0;
int32_t offset_x = 0;
int32_t offset_y = 0;
if (gConfigGeneral.ZoomToCursor && atCursor)
if (Config::Get().general.ZoomToCursor && atCursor)
{
WindowViewportGetMapCoordsByCursor(w, &saved_map_x, &saved_map_y, &offset_x, &offset_y);
}
@@ -992,7 +992,7 @@ void WindowZoomSet(WindowBase& w, ZoomLevel zoomLevel, bool atCursor)
}
// Zooming to cursor? Centre around the tile we were hovering over just now.
if (gConfigGeneral.ZoomToCursor && atCursor)
if (Config::Get().general.ZoomToCursor && atCursor)
{
WindowViewportCentreTileAroundCursor(w, saved_map_x, saved_map_y, offset_x, offset_y);
}
@@ -1846,7 +1846,7 @@ void WindowBase::ResizeFrame()
// Title
widgets[1].right = width - 2;
// Close button
if (gConfigInterface.WindowButtonsOnTheLeft)
if (Config::Get().interface.WindowButtonsOnTheLeft)
{
widgets[2].left = 2;
widgets[2].right = 2 + CloseButtonWidth;