Magic number changes, get rid of nulplanet structure.

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

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