Rewrite to get ride of FORTRANish galaxy and newstuff arrays. It's

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

diff --git a/sst.c b/sst.c
index dd73713dc7a3d1ac8a56cff1d8b5b0d7d35a7893..2dca29e412550cde4c44e2c0804f12f7a0b8110d 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -114,8 +114,7 @@ Eric Raymond's changes:
 
    2. Status report now indicates when dilithium crystals are on board.
 
-   3. Can now report starbases left in scrscan.
-
+   3. Per Dave Matuszek's remarks, Thingy state is not saved across games.
    */
 
 /* the input queue */
@@ -484,14 +483,14 @@ static void makemoves(void)
                events();
                if (alldone) break;             // Events did us in
            }
-           if (game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE) { // Galaxy went Nova!
+           if (game.state.galaxy[quadx][quady].supernova) { // Galaxy went Nova!
                atover(0);
                continue;
            }
            if (hitme && justin==0) {
                attack(2);
                if (alldone) break;
-               if (game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE) {       // went NOVA! 
+               if (game.state.galaxy[quadx][quady].supernova) {        // went NOVA! 
                    atover(0);
                    hitme = TRUE;
                    continue;
@@ -748,7 +747,7 @@ void debugme(void)
     proutn("Reset damage? ");
     if (ja() != 0) {
        int i;
-       for (i=0; i <= NDEVICES; i++) 
+       for (i=0; i < NDEVICES; i++) 
            if (game.damage[i] > 0.0) 
                game.damage[i] = 0.0;
        stdamtim = 1e30;
@@ -762,7 +761,7 @@ void debugme(void)
     proutn("Cause selective damage? ");
     if (ja() != 0) {
        int i, key;
-       for (i=1; i <= NDEVICES; i++) {
+       for (i=0; i < NDEVICES; i++) {
            proutn("Kill ");
            proutn(device[i]);
            proutn("? ");