From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 6 Feb 2005 16:45:25 +0000 (+0000)
Subject: More magic-number hunting -- BASEMAX this time.
X-Git-Tag: 2.0~354
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=1c22a200da79b10c888c63f412906d60a05b68e2;p=super-star-trek.git

More magic-number hunting -- BASEMAX this time.
---

diff --git a/ai.c b/ai.c
index db9de87..1367f43 100644
--- a/ai.c
+++ b/ai.c
@@ -364,8 +364,8 @@ static int movescom(int iqx, int iqy, int flag, int *ipage) {
 void scom(int *ipage) {
 	int i, i2, j, ideltax, ideltay, ibqx, ibqy, sx, sy, ifindit, iwhichb;
 	int iqx, iqy;
-	int basetbl[6];
-	double bdist[6];
+	int basetbl[BASEMAX];
+	double bdist[BASEMAX];
 	int flag;
 #ifdef DEBUG
 	if (idebug) prout("SCOM");
diff --git a/setup.c b/setup.c
index 0ecac03..572d922 100644
--- a/setup.c
+++ b/setup.c
@@ -253,7 +253,7 @@ void setup(int needprompt) {
 			for (j = i-1; j > 0; j--) {
 				/* Improved placement algorithm to spread out bases */
 				double distq = square(ix-game.state.baseqx[j]) + square(iy-game.state.baseqy[j]);
-				if (distq < 6.0*(6-inbase) && Rand() < 0.75) {
+				if (distq < 6.0*(BASEMAX-inbase) && Rand() < 0.75) {
 					contflag = TRUE;
 #ifdef DEBUG
 					proutn("DEBUG: Abandoning base #%d at %d-%d\n", i, ix, iy);
@@ -261,7 +261,7 @@ void setup(int needprompt) {
 					break;
 				}
 #ifdef DEBUG
-				else if (distq < 6.0 * (6-inbase)) {
+				else if (distq < 6.0 * (BASEMAX-inbase)) {
 					proutn("DEBUG: saving base #%d, close to #%d\n", i, j);
 				}
 #endif
diff --git a/sst.h b/sst.h
index beeee5c..0cb66ce 100644
--- a/sst.h
+++ b/sst.h
@@ -20,6 +20,7 @@
 #define NEVENTS (8)
 #define GALSIZE	(8)
 #define QUADSIZE (10)
+#define BASEMAX	(6)
 
 typedef struct {
     int x;	/* Quadrant location of planet */
@@ -42,8 +43,8 @@ typedef struct {
 	killc,			// commanders killed
 	galaxy[GALSIZE+1][GALSIZE+1], 	// The Galaxy (subscript 0 not used)
 	cx[QUADSIZE+1],cy[QUADSIZE+1],	// Commander quadrant coordinates
-	baseqx[6],		// Base quadrant X
-	baseqy[6],		// Base quadrant Y
+	baseqx[BASEMAX],		// Base quadrant X
+	baseqy[BASEMAX],		// Base quadrant Y
 	newstuf[GALSIZE+1][GALSIZE+1],	// Extended galaxy goodies
 	isx, isy,		// Coordinate of Super Commander
 	nscrem,			// remaining super commanders