Fix several minor bugs reported by Stas Sergeev.

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

diff --git a/planets.c b/planets.c
index 5cf8965784186dab691972d1ad5dff1f73fa7d1a..5ea7479ec97ca992c662ba888b25533cb4c99ba2 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -82,7 +82,7 @@ void orbit(void)
     ididit=1;
 }
 
-void sensor(int force) 
+void sensor(void) 
 {
     skip(1);
     chew();
@@ -90,11 +90,11 @@ void sensor(int force)
        prout("Short range sensors damaged.");
        return;
     }
-    if (!plnetx && ((game.state.plnets[iplnet].known == unknown || force))) {
+    if (!plnetx && (game.options & OPTION_TTY)) {
        prout("Spock- \"No planet in this quadrant, Captain.\"");
        return;
     }
-    if ((plnetx != 0)&&(game.state.plnets[iplnet].known == unknown)) {
+    if ((plnetx != 0)&& (game.state.plnets[iplnet].known == unknown)) {
        prout("Spock-  \"Sensor scan for %s-", cramlc(quadrant, quadx, quady));
        skip(1);
        prout("         Planet at %s is of class %s.", 
@@ -482,8 +482,8 @@ void deathray(void)
        proutn("Spock-  \"I believe the word is");
        prouts(" *ASTONISHING*");
        prout(" Mr. Sulu.");
-       for (i=1; i<=QUADSIZE; i++)
-           for (j=1; j<=QUADSIZE; j++)
+       for_sectors(i)
+           for_sectors(j)
                if (game.quad[i][j] == IHDOT) game.quad[i][j] = IHQUEST;
        prout("  Captain, our quadrant is now infested with");
        prouts(" - - - - - -  *THINGS*.");