X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=battle.c;h=bd8070ad082d2239cabe4065e204d6597dc02a7d;hp=549039999cdbf594490e157a670a81c466325d2b;hb=f1af4f83e663d93c704ce0ada75ea4aa9ae3c65b;hpb=0e1982742e811243ff7887fbc8e1963f31138608

diff --git a/battle.c b/battle.c
index 5490399..bd8070a 100644
--- a/battle.c
+++ b/battle.c
@@ -176,7 +176,7 @@ void ram(int ibumpd, int ienm, int ix, int iy)
     return;
 }
 
-void torpedo(double course, double r, int inx, int iny, double *hit, int wait, int i, int n) 
+void torpedo(double course, double r, int inx, int iny, double *hit, int i, int n)
 {
     int l, iquad=0, ix=0, iy=0, jx=0, jy=0, shoved=0, ll;
 	
@@ -202,8 +202,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
 	iy = y + 0.5;
 	if (!VALID_SECTOR(ix, iy)) break;
 	iquad=game.quad[ix][iy];
-	tracktorpedo(x, y, ix, iy, wait, l, i, n, iquad);
-	wait = 1;
+	tracktorpedo(ix, iy, l, i, n, iquad);
 	if (iquad==IHDOT) continue;
 	/* hit something */
 	setwnd(message_window);
@@ -255,7 +254,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
 	case IHR: /* Hit a regular enemy */
 	case IHK:
 	    /* find the enemy */
-	    for (ll=1; ll <= nenhere; ll++)
+	    for_local_enemies(ll)
 		if (ix==game.kx[ll] && iy==game.ky[ll]) break;
 	    kp = fabs(game.kpower[ll]);
 	    h1 = 700.0 + 100.0*Rand() -
@@ -299,7 +298,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
 	case IHB: /* Hit a base */
 	    skip(1);
 	    prout("***STARBASE DESTROYED..");
-	    for (ll=1; ll<=game.state.rembase; ll++) {
+	    for_starbases(ll) {
 		if (game.state.baseqx[ll]==quadx && game.state.baseqy[ll]==quady) {
 		    game.state.baseqx[ll]=game.state.baseqx[game.state.rembase];
 		    game.state.baseqy[ll]=game.state.baseqy[game.state.rembase];
@@ -410,7 +409,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
 	game.quad[jx][jy]=iquad;
 	game.quad[ix][iy]=IHDOT;
 	prout(" displaced by blast to %s ", cramlc(sector, jx, jy));
-	for (ll=1; ll<=nenhere; ll++)
+	for_local_enemies(ll)
 	    game.kdist[ll] = game.kavgd[ll] = sqrt(square(sectx-game.kx[ll])+square(secty-game.ky[ll]));
 	sortkl();
 	return;
@@ -482,7 +481,7 @@ void attack(int torps_ok)
     if (shldchg == 1) chgfac = 0.25+0.5*Rand();
     skip(1);
     if (skill <= SKILL_FAIR) i = 2;
-    for (l=1; l <= nenhere; l++) {
+    for_local_enemies(l) {
 	if (game.kpower[l] < 0) continue;	/* too weak to attack */
 	/* compute hit strength and diminsh shield power */
 	r = Rand();
@@ -518,7 +517,7 @@ void attack(int torps_ok)
 	    prout("  ");
 	    r = (Rand()+Rand())*0.5 -0.5;
 	    r += 0.002*game.kpower[l]*r;
-	    torpedo(course, r, jx, jy, &hit, 0, 1, 1);
+	    torpedo(course, r, jx, jy, &hit, 1, 1);
 	    if (game.state.remkl==0) 
 		finish(FWON); /* Klingons did themselves in! */
 	    if (game.state.galaxy[quadx][quady].supernova || alldone) 
@@ -595,7 +594,7 @@ void attack(int torps_ok)
 	}
     }
     /* After attack, reset average distance to enemies */
-    for (l = 1; l <= nenhere; l++)
+    for_local_enemies(l)
 	game.kavgd[l] = game.kdist[l];
     sortkl();
     return;
@@ -640,7 +639,7 @@ void deadkl(int ix, int iy, int type, int ixx, int iyy)
 	    game.state.cx[game.state.remcom] = 0;
 	    game.state.cy[game.state.remcom] = 0;
 	    game.state.remcom--;
-	    game.future[FTBEAM] = 1e30;
+	    game.future[FTBEAM] = FOREVER;
 	    if (game.state.remcom != 0)
 		game.future[FTBEAM] = game.state.date + expran(1.0*incom/game.state.remcom);
 	    game.state.killc++;
@@ -651,7 +650,7 @@ void deadkl(int ix, int iy, int type, int ixx, int iyy)
 	case IHS:
 	    game.state.nscrem = ishere = game.state.isx = game.state.isy = isatb = iscate = 0;
 	    game.state.nsckill = 1;
-	    game.future[FSCMOVE] = game.future[FSCDBAS] = 1e30;
+	    game.future[FSCMOVE] = game.future[FSCDBAS] = FOREVER;
 	    break;
 	}
     }
@@ -664,9 +663,9 @@ void deadkl(int ix, int iy, int type, int ixx, int iyy)
     game.state.remtime = game.state.remres/(game.state.remkl + 4*game.state.remcom);
 
     /* Remove enemy ship from arrays describing local conditions */
-    if (game.future[FCDBAS] < 1e30 && batx==quadx && baty==quady && type==IHC)
-	game.future[FCDBAS] = 1e30;
-    for (i=1; i<=nenhere; i++)
+    if (game.future[FCDBAS] < FOREVER && batx==quadx && baty==quady && type==IHC)
+	game.future[FCDBAS] = FOREVER;
+    for_local_enemies(i)
 	if (game.kx[i]==ix && game.ky[i]==iy) break;
     nenhere--;
     if (i <= nenhere)  {
@@ -827,7 +826,7 @@ void photon(void)
 	}
 	if (shldup || condit == IHDOCKED) 
 	    r *= 1.0 + 0.0001*shield;
-	torpedo(course[i], r, sectx, secty, &dummy, 0, i, n);
+	torpedo(course[i], r, sectx, secty, &dummy, i, n);
 	if (alldone || game.state.galaxy[quadx][quady].supernova)
 	    return;
     }
@@ -997,7 +996,7 @@ void phasers(void)
 	irec=0;
 	do {
 	    chew();
-	    if (!kz) for (i = 1; i <= nenhere; i++)
+	    if (!kz) for_local_enemies(i)
 		irec+=fabs(game.kpower[i])/(PHASEFAC*pow(0.90,game.kdist[i]))*
 		    (1.01+0.05*Rand()) + 1.0;
 	    kz=1;
@@ -1032,7 +1031,7 @@ void phasers(void)
 	if (nenhere) {
 	    extra = 0.0;
 	    powrem = rpow;
-	    for (i = 1; i <= nenhere; i++) {
+	    for_local_enemies(i) {
 		hits[i] = 0.0;
 		if (powrem <= 0) continue;
 		hits[i] = fabs(game.kpower[i])/(PHASEFAC*pow(0.90,game.kdist[i]));