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

Fix window limit count accuracy (#4144)

Browse Source
This commit is contained in:
wolfreak99
2016-07-26 03:45:26 -04:00
committed by Michael Steenbeek
parent b95452cde0
commit 67d4ff83e5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/interface/window.c
View File

@@ -35,7 +35,7 @@
#define RCT2_LAST_WINDOW (gWindowNextSlot - 1)
#define RCT2_NEW_WINDOW (gWindowNextSlot)
rct_window g_window_list[WINDOW_LIMIT_MAX];
rct_window g_window_list[WINDOW_LIMIT_MAX + WINDOW_LIMIT_RESERVED];
rct_window * gWindowFirst;
rct_window * gWindowNextSlot;
@@ -355,7 +355,7 @@ static void window_close_surplus(int cap, sint8 avoid_classification)
}
}
//difference between amount open and cap = amount to close
diff = count - cap;
diff = count - WINDOW_LIMIT_RESERVED - cap;
for (i = 0; i < diff; i++) {
rct_window *w = NULL;
//iterates through the list until it finds the newest window, or a window that can be closed
@@ -402,7 +402,8 @@ void window_set_window_limit(int value)
rct_window *window_create(int x, int y, int width, int height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags)
{
// Check if there are any window slots left
if (RCT2_NEW_WINDOW >= &(g_window_list[gConfigGeneral.window_limit])) {
// include WINDOW_LIMIT_RESERVED for items such as the main viewport and toolbars to not appear to be counted.
if (RCT2_NEW_WINDOW >= &(g_window_list[gConfigGeneral.window_limit + WINDOW_LIMIT_RESERVED])) {
rct_window *w = NULL;
// Close least recently used window
for (w = g_window_list; w < RCT2_NEW_WINDOW; w++)

5
src/interface/window.h
View File

@@ -515,11 +515,12 @@ extern modal_callback gLoadSaveCallback;
typedef void (*close_callback)();
#define WINDOW_LIMIT_MIN 8
#define WINDOW_LIMIT_MIN 4
#define WINDOW_LIMIT_MAX 64
#define WINDOW_LIMIT_RESERVED 4 // Used to reserve room for the main viewport, toolbars, etc.
// rct2: 0x01420078
extern rct_window g_window_list[WINDOW_LIMIT_MAX];
extern rct_window g_window_list[WINDOW_LIMIT_MAX + WINDOW_LIMIT_RESERVED];
extern rct_window * gWindowFirst;
extern rct_window * gWindowNextSlot;