X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fevents.c;h=b4b61214b14cecd18efcb09c2c836c9b7c9aa153;hp=072c2e6d95a2b39e56b58caf8dc466fedbe6bc91;hb=2c5438d3c22fe863ad8054d214f2afdd061ad43a;hpb=cbb2d987e8c23c6c25bd441fdef5401d5a89289e

diff --git a/src/events.c b/src/events.c
index 072c2e6..b4b6121 100644
--- a/src/events.c
+++ b/src/events.c
@@ -270,8 +270,8 @@ void events(void)
 		break;
 	    }
 	    i = 0;
-	    for_starbases(j) {
-		for_commanders(k)
+	    for (j = 1; j <= game.state.rembase; j++) {
+		for (k = 1; k <= game.state.remcom; k++)
 		    if (same(game.state.baseq[j], game.state.kcmdr[k]) &&
 			!same(game.state.baseq[j], game.quadrant) &&
 			!same(game.state.baseq[j], game.state.kscmdr)) {
@@ -320,7 +320,7 @@ void events(void)
 	    if (evcode==FCDBAS) {
 		unschedule(FCDBAS);
 		/* find the lucky pair */
-		for_commanders(i)
+		for (i = 1; i <= game.state.remcom; i++)
 		    if (same(game.state.kcmdr[i], game.battle)) 
 			break;
 		if (i > game.state.remcom || game.state.rembase == 0 ||
@@ -358,7 +358,7 @@ void events(void)
 	    }
 	    /* Remove Starbase from galaxy */
 	    game.state.galaxy[game.battle.x][game.battle.y].starbase = false;
-	    for_starbases(i)
+	    for (i = 1; i <= game.state.rembase; i++)
 		if (same(game.state.baseq[i], game.battle))
 		    game.state.baseq[i] = game.state.baseq[game.state.rembase];
 	    game.state.rembase--;
@@ -434,10 +434,10 @@ void events(void)
 	    /* try a whole bunch of times to find something suitable */
 	    i = 100;
 	    do {
-		/* need a quadrant which is not the current one,
-		   which has some stars which are inhabited and
-		   not already under attack, which is not
-		   supernova'ed, and which has some Klingons in it */
+		// need a quadrant which is not the current one,
+		// which has some stars which are inhabited and
+		// not already under attack, which is not
+		// supernova'ed, and which has some Klingons in it
 		w = randplace(GALSIZE);
 		q = &game.state.galaxy[w.x][w.y];
 	    } while (--i &&
@@ -488,10 +488,8 @@ void events(void)
 	    }
 	    break;
 	case FREPRO:		/* Klingon reproduces */
-	    /*
-	     * If we ever switch to a real event queue, we'll need to
-	     * explicitly retrieve and restore the x and y.
-	     */
+	    // If we ever switch to a real event queue, we'll need to
+	    // explicitly retrieve and restore the x and y.
 	    ev = schedule(FREPRO, expran(1.0 * game.intime));
 	    /* see if current distress call still active */
 	    q = &game.state.galaxy[ev->quadrant.x][ev->quadrant.y];
@@ -691,7 +689,7 @@ void nova(coord nov)
 			game.state.nplankl++;
 			crmena(true, IHP, sector, scratch);
 			prout(_(" destroyed."));
-			DESTROY(&game.state.planets[game.iplnet]);
+			game.state.planets[game.iplnet].pclass = destroyed;
 			game.iplnet = 0;
 			invalidate(game.plnet);
 			if (game.landed) {
@@ -702,7 +700,7 @@ void nova(coord nov)
 			break;
 		    case IHB: /* Destroy base */
 			game.state.galaxy[game.quadrant.x][game.quadrant.y].starbase = false;
-			for_starbases(i)
+			for (i = 1; i <= game.state.rembase; i++)
 			    if (same(game.state.baseq[i], game.quadrant)) 
 				break;
 			game.state.baseq[i] = game.state.baseq[game.state.rembase];
@@ -746,7 +744,7 @@ void nova(coord nov)
 		    case IHC: /* Damage/destroy big enemies */
 		    case IHS:
 		    case IHR:
-			for_local_enemies(ll)
+			for (ll = 1; ll <= game.nenhere; ll++)
 			    if (same(game.ks[ll], scratch))
 				break;
 			game.kpower[ll] -= 800.0; /* If firepower is lost, die */
@@ -827,16 +825,14 @@ void supernova(bool induced, coord *w)
 	/* Scheduled supernova -- select star */
 	/* logic changed here so that we won't favor quadrants in top
 	   left of universe */
-	for_quadrants(nq.x) {
-	    for_quadrants(nq.y) {
+	for (nq.x = 1; nq.x <= GALSIZE; nq.x++)
+	    for (nq.y = 1; nq.y <= GALSIZE; nq.y++)
 		stars += game.state.galaxy[nq.x][nq.y].stars;
-	    }
-	}
 	if (stars == 0)
 	    return; /* nothing to supernova exists */
 	num = Rand()*stars + 1;
-	for_quadrants(nq.x) {
-	    for_quadrants(nq.y) {
+	for (nq.x = 1; nq.x <= GALSIZE; nq.x++) {
+	    for (nq.y = 1; nq.y <= GALSIZE; nq.y++) {
 		num -= game.state.galaxy[nq.x][nq.y].stars;
 		if (num <= 0)
 		    break;
@@ -864,8 +860,8 @@ void supernova(bool induced, coord *w)
 	coord ns;
 	/* we are in the quadrant! */
 	num = Rand()* game.state.galaxy[nq.x][nq.y].stars + 1;
-	for_sectors(ns.x) {
-	    for_sectors(ns.y) {
+	for (ns.x = 1; ns.x <= QUADSIZE; ns.x++) {
+	    for (ns.y = 1; ns.y <= QUADSIZE; ns.y++) {
 		if (game.quad[ns.x][ns.y]==IHSTAR) {
 		    num--;
 		    if (num==0)
@@ -923,7 +919,7 @@ void supernova(bool induced, coord *w)
 	int loop;
 	for (loop = 0; loop < game.inplan; loop++)
 	    if (same(game.state.planets[loop].w, nq)) {
-		DESTROY(&game.state.planets[loop]);
+		game.state.planets[loop].pclass = destroyed;
 	    }
     }
     /* Destroy any base in supernovaed quadrant */