More magic-number hunting -- BASEMAX this time.

[super-star-trek.git] / battle.c

diff --git a/battle.c b/battle.c
index df1314839df4fe18ce90622869bbe0974f857c86..15ff3b316b51a235eaf50ca916994fd3756f1e20 100644 (file)
--- a/battle.c
+++ b/battle.c
@@ -186,23 +186,24 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
        deltax /= bigger;
        deltay /= bigger;
         if (game.damage[DSRSENS]==0 || condit==IHDOCKED) 
-           setwnd(SRSCAN_WINDOW);
+           setwnd(srscan_window);
        else 
-           setwnd(LOWER_WINDOW);
+           setwnd(message_window);
        /* Loop to move a single torpedo */
        for (l=1; l <= 15; l++) {
                x += deltax;
                ix = x + 0.5;
-               if (ix < 1 || ix > 10) break;
+               if (ix < 1 || ix > QUADSIZE) break;
                y += deltay;
                iy = y + 0.5;
-               if (iy < 1 || iy > 10) break;
+               if (iy < 1 || iy > QUADSIZE) break;
                iquad=game.quad[ix][iy];
                tracktorpedo(x, y, ix, iy, wait, l, i, n, iquad);
                wait = 1;
                if (iquad==IHDOT) continue;
                /* hit something */
-               setwnd(LOWER_WINDOW);
+               setwnd(message_window);
+               skip(1);        /* start new line after text track */
                switch(iquad) {
                        case IHE: /* Hit our ship */
                        case IHF:
@@ -224,7 +225,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
                                yy = cos(ang)/temp;
                                jx=ix+xx+0.5;
                                jy=iy+yy+0.5;
-                               if (jx<1 || jx>10 || jy<1 ||jy > 10) return;
+                               if (jx<1 || jx>QUADSIZE || jy<1 ||jy > QUADSIZE) return;
                                if (game.quad[jx][jy]==IHBLANK) {
                                        finish(FHOLE);
                                        return;
@@ -272,7 +273,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
                                yy = cos(ang)/temp;
                                jx=ix+xx+0.5;
                                jy=iy+yy+0.5;
-                               if (jx<1 || jx>10 || jy<1 ||jy > 10) {
+                               if (jx<1 || jx>QUADSIZE || jy<1 ||jy > QUADSIZE) {
                                        prout(" damaged but not destroyed.");
                                        return;
                                }
@@ -319,7 +320,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
                                plnetx = plnety = 0;
                                game.quad[ix][iy] = IHDOT;
                                if (landed==1) {
-                                       /* captain parishes on planet */
+                                       /* captain perishes on planet */
                                        finish(FDPLANET);
                                }
                                return;
@@ -397,8 +398,8 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
                }
                break;
        }
-        if(curwnd!=LOWER_WINDOW) {
-           setwnd(LOWER_WINDOW);
+        if(curwnd!=message_window) {
+           setwnd(message_window);
        }
        if (shoved) {
                game.quad[jx][jy]=iquad;
@@ -677,7 +678,7 @@ void deadkl(int ix, int iy, int type, int ixx, int iyy) {
 static int targetcheck(double x, double y, double *course) {
        double deltx, delty;
        /* Return TRUE if target is invalid */
-       if (x < 1.0 || x > 10.0 || y < 1.0 || y > 10.0) {
+       if (x < 1.0 || x > QUADSIZE || y < 1.0 || y > QUADSIZE) {
                huh();
                return 1;
        }