X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=battle.c;h=2633a32f97829a480004336f66671c2bde642efb;hp=9a83fba3898309a5bc148bc2481e2c8b40f294e3;hb=359039abfddd65910747b48f5de6faedd496240e;hpb=62ecc7f7980b836681dc37f6ac0e03f976916050

diff --git a/battle.c b/battle.c
index 9a83fba..2633a32 100644
--- a/battle.c
+++ b/battle.c
@@ -163,7 +163,7 @@ void ram(int ibumpd, int ienm, int ix, int iy) {
 		damage[l] += Time + extradm; /* Damage for at least time of travel! */
 	}
 	shldup = 0;
-	if (d.remkl) {
+	if (state.remkl) {
 		pause(2);
 		dreprt();
 	}
@@ -197,7 +197,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit) {
 		proutn(" - ");
 		cramf(y, 0, 1);
 		proutn("   ");
-		iquad=quad[ix][iy];
+		iquad=frozen.quad[ix][iy];
 		if (iquad==IHDOT) continue;
 		/* hit something */
 		skip(1);
@@ -223,11 +223,11 @@ void torpedo(double course, double r, int inx, int iny, double *hit) {
 				jx=ix+xx+0.5;
 				jy=iy+yy+0.5;
 				if (jx<1 || jx>10 || jy<1 ||jy > 10) return;
-				if (quad[jx][jy]==IHBLANK) {
+				if (frozen.quad[jx][jy]==IHBLANK) {
 					finish(FHOLE);
 					return;
 				}
-				if (quad[jx][jy]!=IHDOT) {
+				if (frozen.quad[jx][jy]!=IHDOT) {
 					/* can't move into object */
 					return;
 				}
@@ -274,12 +274,12 @@ void torpedo(double course, double r, int inx, int iny, double *hit) {
 					prout(" damaged but not destroyed.");
 					return;
 				}
-				if (quad[jx][jy]==IHBLANK) {
+				if (frozen.quad[jx][jy]==IHBLANK) {
 					prout(" buffeted into black hole.");
 					deadkl(ix, iy, iquad, jx, jy);
 					return;
 				}
-				if (quad[jx][jy]!=IHDOT) {
+				if (frozen.quad[jx][jy]!=IHDOT) {
 					/* can't move into object */
 					prout(" damaged but not destroyed.");
 					return;
@@ -292,29 +292,29 @@ void torpedo(double course, double r, int inx, int iny, double *hit) {
 			case IHB: /* Hit a base */
 				prout("***STARBASE DESTROYED..");
 				if (starch[quadx][quady] < 0) starch[quadx][quady] = 0;
-				for (ll=1; ll<=d.rembase; ll++) {
-					if (d.baseqx[ll]==quadx && d.baseqy[ll]==quady) {
-						d.baseqx[ll]=d.baseqx[d.rembase];
-						d.baseqy[ll]=d.baseqy[d.rembase];
+				for (ll=1; ll<=state.rembase; ll++) {
+					if (state.baseqx[ll]==quadx && state.baseqy[ll]==quady) {
+						state.baseqx[ll]=state.baseqx[state.rembase];
+						state.baseqy[ll]=state.baseqy[state.rembase];
 						break;
 					}
 				}
-				quad[ix][iy]=IHDOT;
-				d.rembase--;
+				frozen.quad[ix][iy]=IHDOT;
+				state.rembase--;
 				basex=basey=0;
-				d.galaxy[quadx][quady] -= 10;
-				d.basekl++;
+				state.galaxy[quadx][quady] -= 10;
+				state.basekl++;
 				newcnd();
 				return;
 			case IHP: /* Hit a planet */
 				crmena(1, iquad, 2, ix, iy);
 				prout(" destroyed.");
-				d.nplankl++;
-				d.newstuf[quadx][quady] -= 1;
-				d.plnets[iplnet] = nulplanet;
+				state.nplankl++;
+				state.newstuf[quadx][quady] -= 1;
+				state.plnets[iplnet] = nulplanet;
 				iplnet = 0;
 				plnetx = plnety = 0;
-				quad[ix][iy] = IHDOT;
+				frozen.quad[ix][iy] = IHDOT;
 				if (landed==1) {
 					/* captain parishes on planet */
 					finish(FDPLANET);
@@ -337,7 +337,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit) {
 				proutn("Mr. Spock-");
 				prouts("  \"Facinating!\"");
 				skip(1);
-				quad[ix][iy] = IHDOT;
+				frozen.quad[ix][iy] = IHDOT;
 				return;
 			case IHBLANK: /* Black hole */
 				skip(1);
@@ -357,7 +357,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit) {
 				h1 = fabs(h1);
 				if (h1 >= 600) {
 					prout(" destroyed.");
-					quad[ix][iy] = IHDOT;
+					frozen.quad[ix][iy] = IHDOT;
 					ithere = 0;
 					ithx = ithy = 0;
 					return;
@@ -367,7 +367,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit) {
 					return;
 				}
 				prout(" disappears.");
-				quad[ix][iy] = IHWEB;
+				frozen.quad[ix][iy] = IHWEB;
 				ithere = ithx = ithy = 0;
 				{
 					int dum, my;
@@ -385,8 +385,8 @@ void torpedo(double course, double r, int inx, int iny, double *hit) {
 		break;
 	}
 	if (shoved) {
-		quad[jx][jy]=iquad;
-		quad[ix][iy]=IHDOT;
+		frozen.quad[jx][jy]=iquad;
+		frozen.quad[ix][iy]=IHDOT;
 		proutn(" displaced by blast to");
 		cramlc(2, jx, jy);
 		skip(1);
@@ -469,7 +469,7 @@ void attack(int k) {
 		if (kpower[l] < 500) r *= 0.25; 
 		jx = kx[l];
 		jy = ky[l];
-		iquad = quad[jx][jy];
+		iquad = frozen.quad[jx][jy];
 		itflag = (iquad == IHK && r > 0.0005) || k == 0 ||
 			(iquad==IHC && r > 0.015) ||
 			(iquad==IHR && r > 0.3) ||
@@ -495,8 +495,8 @@ void attack(int k) {
 			r = (Rand()+Rand())*0.5 -0.5;
 			r += 0.002*kpower[l]*r;
 			torpedo(course, r, jx, jy, &hit);
-			if (d.remkl==0) finish(FWON); /* Klingons did themselves in! */
-			if (d.galaxy[quadx][quady] == 1000 ||
+			if (state.remkl==0) finish(FWON); /* Klingons did themselves in! */
+			if (state.galaxy[quadx][quady] == 1000 ||
 				alldone) return; /* Supernova or finished */
 			if (hit == 0) continue;
 		}
@@ -590,10 +590,10 @@ void deadkl(int ix, int iy, int type, int ixx, int iyy) {
 	/* Decide what kind of enemy it is and update approriately */
 	if (type == IHR) {
 		/* chalk up a Romulan */
-		d.newstuf[quadx][quady] -= 10;
+		state.newstuf[quadx][quady] -= 10;
 		irhere--;
-		d.nromkl++;
-		d.nromrem--;
+		state.nromkl++;
+		state.nromrem--;
 	}
 	else if (type == IHT) {
 		/* Killed a Tholian */
@@ -601,41 +601,41 @@ void deadkl(int ix, int iy, int type, int ixx, int iyy) {
 	}
 	else {
 		/* Some type of a Klingon */
-		d.galaxy[quadx][quady] -= 100;
+		state.galaxy[quadx][quady] -= 100;
 		klhere--;
-		d.remkl--;
+		state.remkl--;
 		switch (type) {
 			case IHC:
 				comhere = 0;
-				for (i=1; i<=d.remcom; i++)
-					if (d.cx[i]==quadx && d.cy[i]==quady) break;
-				d.cx[i] = d.cx[d.remcom];
-				d.cy[i] = d.cy[d.remcom];
-				d.cx[d.remcom] = 0;
-				d.cy[d.remcom] = 0;
-				d.remcom--;
+				for (i=1; i<=state.remcom; i++)
+					if (state.cx[i]==quadx && state.cy[i]==quady) break;
+				state.cx[i] = state.cx[state.remcom];
+				state.cy[i] = state.cy[state.remcom];
+				state.cx[state.remcom] = 0;
+				state.cy[state.remcom] = 0;
+				state.remcom--;
 				future[FTBEAM] = 1e30;
-				if (d.remcom != 0)
-					future[FTBEAM] = d.date + expran(1.0*incom/d.remcom);
-				d.killc++;
+				if (state.remcom != 0)
+					future[FTBEAM] = state.date + expran(1.0*incom/state.remcom);
+				state.killc++;
 				break;
 			case IHK:
-				d.killk++;
+				state.killk++;
 				break;
 			case IHS:
-				d.nscrem = ishere = d.isx = d.isy = isatb = iscate = 0;
-				d.nsckill = 1;
+				state.nscrem = ishere = state.isx = state.isy = isatb = iscate = 0;
+				state.nsckill = 1;
 				future[FSCMOVE] = future[FSCDBAS] = 1e30;
 				break;
 		}
 	}
 
 	/* For each kind of enemy, finish message to player */
-	prout(" destroyed.");
-	quad[ix][iy] = IHDOT;
-	if (d.remkl==0) return;
+	prout(" destroyestate.");
+	frozen.quad[ix][iy] = IHDOT;
+	if (state.remkl==0) return;
 
-	d.remtime = d.remres/(d.remkl + 4*d.remcom);
+	state.remtime = state.remres/(state.remkl + 4*state.remcom);
 
 	if (type == IHT) return;
 
@@ -814,9 +814,9 @@ void photon(void) {
 			proutn("Torpedo track- ");
 		}
 		torpedo(course[i], r, sectx, secty, &dummy);
-		if (alldone || d.galaxy[quadx][quady]==1000) return;
+		if (alldone || state.galaxy[quadx][quady]==1000) return;
 	}
-	if (d.remkl==0) finish(FWON);
+	if (state.remkl==0) finish(FWON);
 }
 
 	
@@ -1059,7 +1059,7 @@ void phasers(void) {
 			rpow = 0.0;
 			for (k = 1; k <= nenhere;) {
 				int ii = kx[k], jj = ky[k];
-				int ienm = quad[ii][jj];
+				int ienm = frozen.quad[ii][jj];
 				if (msgflag) {
 					proutn("Energy available= ");
 					cramf(energy-.006-(ifast?200:0), 0, 2);
@@ -1190,12 +1190,12 @@ void hittem(double *hits) {
 		}
 		else
 			proutn("Very small hit on ");
-		ienm = quad[ii][jj];
+		ienm = frozen.quad[ii][jj];
 		crmena(0,ienm,2,ii,jj);
 		skip(1);
 		if (kpow == 0) {
 			deadkl(ii, jj, ienm, ii, jj);
-			if (d.remkl==0) finish(FWON);
+			if (state.remkl==0) finish(FWON);
 			if (alldone) return;
 			kk--; /* don't do the increment */
 		}