X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=reports.c;h=8b01a6d5d00f34bddd93c189ec58387889539a97;hp=6424bae32f53e293a0efee108f5482aa1d5b788e;hb=760ecf730c119682b414153a629ec2adc224434f;hpb=5952a98d5a83ad6ed9dfe7821ed427504f280af1

diff --git a/reports.c b/reports.c
index 6424bae..8b01a6d 100644
--- a/reports.c
+++ b/reports.c
@@ -129,12 +129,12 @@ void lrscan(void) {
 	for (x = quadx-1; x <= quadx+1; x++) {
 		proutn(" ");
 		for (y = quady-1; y <= quady+1; y++) {
-			if (x == 0 || x > 8 || y == 0 || y > 8)
+			if (x == 0 || x > GALSIZE || y == 0 || y > GALSIZE)
                                 proutn("  -1");
 			else {
-                                if (game.state.galaxy[x][y]<1000) proutn(" %3d", game.state.galaxy[x][y]);
+                                if (game.state.galaxy[x][y]<SUPERNOVA_PLACE) proutn(" %3d", game.state.galaxy[x][y]);
                                 else proutn("***");
-				game.starch[x][y] = game.damage[DRADIO] > 0 ? game.state.galaxy[x][y]+1000 : 1;
+				game.starch[x][y] = game.damage[DRADIO] > 0 ? game.state.galaxy[x][y]+SUPERNOVA_PLACE : 1;
 			}
 		}
                 prout(" ");
@@ -173,9 +173,9 @@ void chart(int nn) {
 		if (condit == IHDOCKED) {
 			/* We are docked, so restore chart from base information */
 			stdamtim = game.state.date;
-			for (i=1; i <= 8 ; i++)
-				for (j=1; j <= 8; j++)
-					if (game.starch[i][j] == 1) game.starch[i][j] = game.state.galaxy[i][j]+1000;
+			for (i=1; i <= GALSIZE ; i++)
+				for (j=1; j <= GALSIZE; j++)
+					if (game.starch[i][j] == 1) game.starch[i][j] = game.state.galaxy[i][j]+SUPERNOVA_PLACE;
 		}
 		else {
 		    proutn("(Last surveillance update %d stardates ago.",
@@ -184,16 +184,16 @@ void chart(int nn) {
 	}
 
 	prout("      1    2    3    4    5    6    7    8");
-	for (i = 1; i <= 8; i++) {
+	for (i = 1; i <= GALSIZE; i++) {
                 proutn("%d |", i);
-		for (j = 1; j <= 8; j++) {
+		for (j = 1; j <= GALSIZE; j++) {
 		        char buf[4];
                         proutn("  ");
 			if (game.starch[i][j] < 0)
                                 strcpy(buf, ".1.");
 			else if (game.starch[i][j] == 0)
                                 strcpy(buf, "...");
-                        else if (game.state.galaxy[i][j]>=1000)
+                        else if (game.state.galaxy[i][j]>=SUPERNOVA_PLACE)
                                 strcpy(buf, "***");
 			else
 				sprintf(buf, "%03d", game.state.galaxy[i][j]);
@@ -203,7 +203,7 @@ void chart(int nn) {
 			proutn(buf);
 		}
                 proutn("  |");
-                if (i<8) proutn("\n\r");
+                if (i<GALSIZE) proutn("\n\r");
 	}
 	prout("");	/* flush output */
 }
@@ -227,7 +227,7 @@ int srscan(int l) {
 		prout("  [Using Base's sensors]");
 	}
 	else proutn("     Short-range scan\n\r");
-	if (goodScan) game.starch[quadx][quady] = game.damage[DRADIO]>0.0 ? game.state.galaxy[quadx][quady]+1000:1;
+	if (goodScan) game.starch[quadx][quady] = game.damage[DRADIO]>0.0 ? game.state.galaxy[quadx][quady]+SUPERNOVA_PLACE:1;
 	scan();
 	if (isit("chart")) nn = TRUE;
 	if (isit("no")) rightside = FALSE;
@@ -238,10 +238,10 @@ int srscan(int l) {
 	while (scan() == IHEOL)
 	    proutn("Information desired? ");
 	chew();
-	for (k = 1; k <= 10; k++)
+	for (k = 1; k <= sizeof(requests)/sizeof(requests[0]); k++)
 	    if (strncmp(citem,requests[k],min(2,strlen(citem)))==0)
 		break;
-	if (k > 10) {
+	if (k > sizeof(requests)/sizeof(requests[0])) {
 	    prout("UNRECOGNIZED REQUEST. Legal requests are:\n"
 		  "  date, condition, position, lsupport, warpfactor,\n"
 		  "  energy, torpedoes, shields, klingons, time.");
@@ -257,11 +257,11 @@ int srscan(int l) {
 	break;
     }
     if (condit != IHDOCKED) newcnd();
-    for (i = 1; i <= 10; i++) {
+    for (i = 1; i <= QUADSIZE; i++) {
 	jj = (k!=0 ? k : i);
 	if (leftside) {
 	    proutn("%2d  ", i);
-	    for (j = 1; j <= 10; j++) {
+	    for (j = 1; j <= QUADSIZE; j++) {
 		if (goodScan || (abs(i-sectx)<= 1 && abs(j-secty) <= 1)){
 		    if ((game.quad[i][j]==IHMATER0)||(game.quad[i][j]==IHMATER1)||(game.quad[i][j]==IHMATER2)||(game.quad[i][j]==IHE)||(game.quad[i][j]==IHF)){
 			switch (condit) {
@@ -346,7 +346,7 @@ int srscan(int l) {
 		break;
 	    }
 	}
-	if (i<10) proutn("\n\r");
+	if (i<sizeof(requests)/sizeof(requests[0])) proutn("\n\r");
 	if (k!=0) return(goodScan);
     }
     prout("");
@@ -389,13 +389,13 @@ void eta(void) {
 	}
         else {
                 if (quady>ix1) ix2 = 1;
-                else ix2=10;
+                else ix2=QUADSIZE;
                 if (quadx>iy1) iy2 = 1;
-                else iy2=10;
+                else iy2=QUADSIZE;
 	}
 
-	if (ix1 > 8 || ix1 < 1 || iy1 > 8 || iy1 < 1 ||
-		ix2 > 10 || ix2 < 1 || iy2 > 10 || iy2 < 1) {
+	if (ix1 > GALSIZE || ix1 < 1 || iy1 > GALSIZE || iy1 < 1 ||
+		ix2 > QUADSIZE || ix2 < 1 || iy2 > QUADSIZE || iy2 < 1) {
 		huh();
 		return;
 	}