Get rid of some macros that block mechanical translation.

[super-star-trek.git] / src / planets.c

diff --git a/src/planets.c b/src/planets.c
index e9cfcc2c7bb38180fd8bfc9d4ab1085e5a31e075..f91a7d6e84516abc4802af642b4f8dadde0921c2 100644 (file)
--- a/src/planets.c
+++ b/src/planets.c
@@ -22,10 +22,11 @@ void survey(void)
     prout(_("Spock-  \"Planet report follows, Captain.\""));
     skip(1);
     for (i = 0; i < game.inplan; i++) {
+       if (game.state.planets[i].pclass == destroyed)
+           continue;
        if ((game.state.planets[i].known != unknown
-           && game.state.planets[i].inhabited == UNINHABITED)
-           || (idebug && game.state.planets[i].w.x !=0)
-           ) {
+            && game.state.planets[i].inhabited == UNINHABITED)
+           || idebug) {
            iknow = true;
            if (idebug && game.state.planets[i].known==unknown)
                proutn("(Unknown) ");
@@ -449,7 +450,7 @@ void deathray(void)
        while (game.nenhere > 0)
            deadkl(game.ks[1], game.quad[game.ks[1].x][game.ks[1].y],game.ks[1]);
        prout(_("Ensign Chekov-  \"Congratulations, Captain!\""));
-       if (KLINGREM == 0)
+       if ((game.state.remkl + game.state.remcom + game.state.nscrem) == 0)
            finish(FWON);    
        if ((game.options & OPTION_PLAIN) == 0) {
            prout(_("Spock-  \"Captain, I believe the `Experimental Death Ray'"));
@@ -499,8 +500,8 @@ void deathray(void)
        proutn(_("Spock-  \"I believe the word is"));
        prouts(_(" *ASTONISHING*"));
        prout(_(" Mr. Sulu."));
-       for_sectors(i)
-           for_sectors(j)
+       for (i = 1; i <= QUADSIZE; i++)
+           for (j = 1; j <= QUADSIZE; j++)
                if (game.quad[i][j] == IHDOT)
                    game.quad[i][j] = IHQUEST;
        prout(_("  Captain, our quadrant is now infested with"));