Use ANGBAND_TERM_MAX instead of literal 8

(This won't cover nearly all cases, but it helps a little.)

5 files changed, 35 insertions, 23 deletions

diff --git a/src/cmd4.cc b/src/cmd4.cc
index f7317cb1..7c878ae7 100644
--- a/src/cmd4.cc
+++ b/src/cmd4.cc
@@ -834,7 +834,7 @@ static void do_cmd_options_win()
 
 
 	/* Memorize old flags */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		/* Acquire current flags */
 		old_flag[j] = window_flag[j];
@@ -851,7 +851,7 @@ static void do_cmd_options_win()
 		prt("Window Flags (<dir>, t, y, n, ESC) ", 0, 0);
 
 		/* Display the windows */
-		for (j = 0; j < 8; j++)
+		for (j = 0; j < ANGBAND_TERM_MAX; j++)
 		{
 			byte a = TERM_WHITE;
 
@@ -881,7 +881,7 @@ static void do_cmd_options_win()
 			Term_putstr(0, i + 5, -1, a, str);
 
 			/* Display the windows */
-			for (j = 0; j < 8; j++)
+			for (j = 0; j < ANGBAND_TERM_MAX; j++)
 			{
 				byte a = TERM_WHITE;
 
@@ -918,7 +918,7 @@ static void do_cmd_options_win()
 		case 't':
 			{
 				/* Clear windows */
-				for (j = 0; j < 8; j++)
+				for (j = 0; j < ANGBAND_TERM_MAX; j++)
 				{
 					window_flag[j] &= ~(1L << y);
 				}
@@ -968,7 +968,7 @@ static void do_cmd_options_win()
 	}
 
 	/* Notice changes */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		term *old = Term;
 
diff --git a/src/loadsave.cc b/src/loadsave.cc
index 2ef44ca8..e98b832c 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -1592,13 +1592,19 @@ static void do_options(ls_flag_t flag)
 		/*** Window Options ***/
 
 		/* Read the window flags */
-		for (n = 0; n < 8; n++) do_u32b(&oflag[n], flag);
+		for (n = 0; n < ANGBAND_TERM_MAX; n++)
+		{
+			do_u32b(&oflag[n], flag);
+		}
 
 		/* Read the window masks */
-		for (n = 0; n < 8; n++) do_u32b(&mask[n], flag);
+		for (n = 0; n < ANGBAND_TERM_MAX; n++)
+		{
+			do_u32b(&mask[n], flag);
+		}
 
 		/* Analyze the options */
-		for (n = 0; n < 8; n++)
+		for (n = 0; n < ANGBAND_TERM_MAX; n++)
 		{
 			/* Analyze the options */
 			for (i = 0; i < 32; i++)
@@ -1633,10 +1639,16 @@ static void do_options(ls_flag_t flag)
 		/*** Window options ***/
 
 		/* Dump the flags */
-		for (i = 0; i < 8; i++) do_u32b(&window_flag[i], flag);
+		for (i = 0; i < ANGBAND_TERM_MAX; i++)
+		{
+			do_u32b(&window_flag[i], flag);
+		}
 
 		/* Dump the masks */
-		for (i = 0; i < 8; i++) do_u32b(&window_mask[i], flag);
+		for (i = 0; i < ANGBAND_TERM_MAX; i++)
+		{
+			do_u32b(&window_mask[i], flag);
+		}
 	}
 }
 
diff --git a/src/object1.cc b/src/object1.cc
index 34c22a4a..3fb2ef26 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -4367,7 +4367,7 @@ void toggle_inven_equip()
 	int j;
 
 	/* Scan windows */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		/* Unused */
 		if (!angband_term[j]) continue;
@@ -4855,7 +4855,7 @@ static bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode, object_filter
 			int ne = 0;
 
 			/* Scan windows */
-			for (j = 0; j < 8; j++)
+			for (j = 0; j < ANGBAND_TERM_MAX; j++)
 			{
 				/* Unused */
 				if (!angband_term[j]) continue;
diff --git a/src/variable.cc b/src/variable.cc
index 7aae4187..1bcab738 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -258,8 +258,8 @@ char *macro__buf;
 /*
  * The array of window options
  */
-u32b window_flag[8];
-u32b window_mask[8];
+u32b window_flag[ANGBAND_TERM_MAX];
+u32b window_mask[ANGBAND_TERM_MAX];
 
 
 /*
diff --git a/src/xtra1.cc b/src/xtra1.cc
index 7141630e..05bf40b3 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -1087,7 +1087,7 @@ static void fix_inven()
 	int j;
 
 	/* Scan windows */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		term *old = Term;
 
@@ -1121,7 +1121,7 @@ static void fix_equip()
 	int j;
 
 	/* Scan windows */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		term *old = Term;
 
@@ -1153,7 +1153,7 @@ static void fix_player()
 	int j;
 
 	/* Scan windows */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		term *old = Term;
 
@@ -1193,7 +1193,7 @@ void fix_message()
 	int x, y;
 
 	/* Scan windows */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		term *old = Term;
 
@@ -1246,7 +1246,7 @@ static void fix_overhead()
 	int cy, cx;
 
 	/* Scan windows */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		term *old = Term;
 
@@ -1279,7 +1279,7 @@ static void fix_monster()
 	int j;
 
 	/* Scan windows */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		term *old = Term;
 
@@ -1315,7 +1315,7 @@ static void fix_object()
 	int j;
 
 	/* Scan windows */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		term *old = Term;
 
@@ -1355,7 +1355,7 @@ static void fix_m_list()
 		std::vector<u16b>(r_info.size(), 0);
 
 	/* Scan windows */
-	for (std::size_t j = 0; j < 8; j++)
+	for (std::size_t j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		term *old = Term;
 
@@ -4226,7 +4226,7 @@ void window_stuff()
 	if (!p_ptr->window) return;
 
 	/* Scan windows */
-	for (j = 0; j < 8; j++)
+	for (j = 0; j < ANGBAND_TERM_MAX; j++)
 	{
 		/* Save usable flags */
 		if (angband_term[j]) mask |= window_flag[j];