Magic number changes, get rid of nulplanet structure.

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

diff --git a/setup.c b/setup.c
index 9b5ac4241b9abda67b875a4ef39c89fb6af1446c..24c5f6f6d25e58a82da1c78e1650ed046cd1f875 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -161,7 +161,7 @@ void abandn(void) {
        iscraft=0; /* Gallileo disappears */\r
        /* Resupply ship */\r
        condit=IHDOCKED;\r
-       for (l = 1; l <= ndevice; l++) game.damage[l] = 0.0;\r
+       for (l = 1; l <= NDEVICES; l++) game.damage[l] = 0.0;\r
        game.damage[DSHUTTL] = -1;\r
        energy = inenrg = 3000.0;\r
        shield = inshld = 1250.0;\r
@@ -195,7 +195,7 @@ void setup(void) {
        nprobes = (int)(3.0*Rand() + 2.0);      /* Give them 2-4 of these wonders */\r
        warpfac = 5.0;\r
        wfacsq = warpfac * warpfac;\r
-       for (i=0; i <= ndevice; i++) game.damage[i] = 0.0;\r
+       for (i=0; i <= NDEVICES; i++) game.damage[i] = 0.0;\r
        // Set up assorted game parameters\r
        batx = baty = 0;\r
        game.state.date = indate = 100.0*(int)(31.0*Rand()+20.0);\r
@@ -298,15 +298,15 @@ void setup(void) {
                game.state.cy[i] = iy;\r
        }\r
        // Locate planets in galaxy\r
-       for (i = 1; i <= inplan; i++) {\r
+       for (i = 0; i < inplan; i++) {\r
                do iran8(&ix, &iy);\r
                while (game.state.newstuf[ix][iy] > 0);\r
                game.state.newstuf[ix][iy] = 1;\r
                game.state.plnets[i].x = ix;\r
                game.state.plnets[i].y = iy;\r
-               game.state.plnets[i].pclass = Rand()*3.0 + 1.0; // Planet class M N or O\r
+               game.state.plnets[i].pclass = Rand()*3.0; // Planet class M N or O\r
                game.state.plnets[i].crystals = 1.5*Rand();             // 1 in 3 chance of crystals\r
-               game.state.plnets[i].known = 0;\r
+               game.state.plnets[i].known = unknown;\r
        }\r
        // Locate Romulans\r
        for (i = 1; i <= game.state.nromrem; i++) {\r
@@ -593,9 +593,9 @@ void newqad(int shutup) {
        \r
        if (nplan) {\r
                // If quadrant needs a planet, put it in\r
-               for (i=1; i <= inplan; i++)\r
+               for (i=0; i < inplan; i++)\r
                        if (game.state.plnets[i].x == quadx && game.state.plnets[i].y == quady) break;\r
-               if (i <= inplan) {\r
+               if (i < inplan) {\r
                        iplnet = i;\r
                        dropin(IHP, &plnetx, &plnety);\r
                }\r