X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=events.c;h=0cbc88071c8060f71d49a272290b4855d76d2c0e;hp=1fad7134a47b2b0ae5acbdf5e1059003826e05b3;hb=77e371705e1e059173ec9c88f63be7a460e44e50;hpb=02f05de93d48d0147cfffbb8e55ca7776ca09797

diff --git a/events.c b/events.c
index 1fad713..0cbc880 100644
--- a/events.c
+++ b/events.c
@@ -51,7 +51,7 @@ void events(void) {
 		repair = xtime;
 		if (condit == IHDOCKED) repair /= docfac;
 		/* Don't fix Deathray here */
-		for (l=1; l<=ndevice; l++)
+		for (l=1; l<=NDEVICES; l++)
 			if (game.damage[l] > 0.0 && l != DDRAY)
 				game.damage[l] -= (game.damage[l]-repair > 0.0 ? repair : game.damage[l]);
 		/* If radio repaired, update star chart and attack reports */
@@ -473,7 +473,7 @@ void nova(int ix, int iy) {
 						game.state.nplankl++;
 						crmena(1, IHP, 2, ii, jj);
 						prout(" destroyed.");
-						game.state.plnets[iplnet] = nulplanet;
+						DESTROY(&game.state.plnets[iplnet]);
 						iplnet = plnetx = plnety = 0;
 						if (landed == 1) {
 							finish(FPNOVA);
@@ -715,9 +715,9 @@ void snova(int insx, int insy) {
 	npdead = num - nrmdead*10;
 	if (npdead) {
 		int l;
-		for (l = 1; l <= inplan; l++)
+		for (l = 0; l < inplan; l++)
 			if (game.state.plnets[l].x == nqx && game.state.plnets[l].y == nqy) {
-				game.state.plnets[l] = nulplanet;
+			    DESTROY(&game.state.plnets[l]);
 			}
 	}
 	/* Destroy any base in supernovaed quadrant */