From 3b8bd8ce933f90743bc7cf6f202b3f38e42282ba Mon Sep 17 00:00:00 2001
From: wolfreak99 <jbminor1991@gmail.com>
Date: Fri, 15 Jul 2016 10:25:59 -0400
Subject: [PATCH] rename max_window_count to window_limit_max

---
 src/config.c             | 2 +-
 src/interface/viewport.h | 2 +-
 src/interface/window.c   | 6 +++---
 src/interface/window.h   | 6 +++---
 src/windows/options.c    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/config.c b/src/config.c
index a9af40948e..45369d0b62 100644
--- a/src/config.c
+++ b/src/config.c
@@ -226,7 +226,7 @@ config_property_definition _generalDefinitions[] = {
 	{ offsetof(general_configuration, last_save_landscape_directory),   "last_landscape_directory",     CONFIG_VALUE_TYPE_STRING,       { .value_string = NULL },       NULL                    },
 	{ offsetof(general_configuration, last_save_scenario_directory),    "last_scenario_directory",      CONFIG_VALUE_TYPE_STRING,       { .value_string = NULL },       NULL                    },
 	{ offsetof(general_configuration, last_save_track_directory),       "last_track_directory",         CONFIG_VALUE_TYPE_STRING,       { .value_string = NULL },       NULL                    },
-	{ offsetof(general_configuration, window_limit),					"window_limit",					CONFIG_VALUE_TYPE_UINT8,		MAX_WINDOW_COUNT,				NULL					},
+	{ offsetof(general_configuration, window_limit),					"window_limit",					CONFIG_VALUE_TYPE_UINT8,		WINDOW_LIMIT_MAX,				NULL					},
 	
 };
 
diff --git a/src/interface/viewport.h b/src/interface/viewport.h
index 1ed9112f47..0576740fe8 100644
--- a/src/interface/viewport.h
+++ b/src/interface/viewport.h
@@ -85,7 +85,7 @@ typedef struct viewport_interaction_info {
 	};
 } viewport_interaction_info;
 
-#define MAX_VIEWPORT_COUNT MAX_WINDOW_COUNT
+#define MAX_VIEWPORT_COUNT WINDOW_LIMIT_MAX
 
 #define gSavedViewX				RCT2_GLOBAL(RCT2_ADDRESS_SAVED_VIEW_X, sint16)
 #define gSavedViewY				RCT2_GLOBAL(RCT2_ADDRESS_SAVED_VIEW_Y, sint16)
diff --git a/src/interface/window.c b/src/interface/window.c
index cb6dfef597..4346523cd4 100644
--- a/src/interface/window.c
+++ b/src/interface/window.c
@@ -35,7 +35,7 @@
 #define RCT2_LAST_WINDOW		(gWindowNextSlot - 1)
 #define RCT2_NEW_WINDOW			(gWindowNextSlot)
 
-rct_window g_window_list[MAX_WINDOW_COUNT];
+rct_window g_window_list[WINDOW_LIMIT_MAX];
 rct_window * gWindowFirst;
 rct_window * gWindowNextSlot;
 
@@ -353,7 +353,7 @@ void window_close_surplus(int cap, sint8 avoid_classification)
 {
 	int count, i, diff;
 	//find the amount of windows that are currently open
-	for (i = 0; i < MAX_WINDOW_COUNT; i++) {
+	for (i = 0; i < WINDOW_LIMIT_MAX; i++) {
 		if (&g_window_list[i] == RCT2_NEW_WINDOW) {
 			count = i;
 			break;
@@ -382,7 +382,7 @@ void window_close_surplus(int cap, sint8 avoid_classification)
 void window_set_window_limit(int value) 
 {
 	int prev = gConfigGeneral.window_limit;
-	int val = clamp(value, MIN_WINDOW_COUNT, MAX_WINDOW_COUNT);
+	int val = clamp(value, WINDOW_LIMIT_MIN, WINDOW_LIMIT_MAX);
 	gConfigGeneral.window_limit = val;
 	config_save_default();
 	// Checks if value decreases and then closes surplus
diff --git a/src/interface/window.h b/src/interface/window.h
index 773c9b4368..eda64fbc9a 100644
--- a/src/interface/window.h
+++ b/src/interface/window.h
@@ -515,11 +515,11 @@ extern modal_callback gLoadSaveCallback;
 
 typedef void (*close_callback)();
 
-#define MIN_WINDOW_COUNT 8
-#define MAX_WINDOW_COUNT 64
+#define WINDOW_LIMIT_MIN 8
+#define WINDOW_LIMIT_MAX 64
 
 // rct2: 0x01420078
-extern rct_window g_window_list[MAX_WINDOW_COUNT];
+extern rct_window g_window_list[WINDOW_LIMIT_MAX];
 
 extern rct_window * gWindowFirst;
 extern rct_window * gWindowNextSlot;
diff --git a/src/windows/options.c b/src/windows/options.c
index 25618e4368..58cd9933cc 100644
--- a/src/windows/options.c
+++ b/src/windows/options.c
@@ -1133,14 +1133,14 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
 			break;
 		case WIDX_WINDOW_LIMIT_UP:
 			i = gConfigGeneral.window_limit;
-			if (i < MAX_WINDOW_COUNT) {
+			if (i < WINDOW_LIMIT_MAX) {
 				window_set_window_limit(++i);
 			}
 			window_invalidate(w);
 			break;
 		case WIDX_WINDOW_LIMIT_DOWN:
 			i = gConfigGeneral.window_limit;
-			if (i > MIN_WINDOW_COUNT) {
+			if (i > WINDOW_LIMIT_MIN) {
 				window_set_window_limit(--i);
 			}
 			window_invalidate(w);