Updates for the build machinery.

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

diff --git a/planets.c b/planets.c
index 87ca4add8f14c365e53f39819d32798130c20f6d..9e847ebe0e92c0b1601bd6e6d6af6b6c2f2c2160 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -17,7 +17,7 @@ static int consumeTime(void)
     }
 #endif
 //     asave = future[FSNOVA];
-//     future[FSNOVA] = 1e30; /* defer supernovas */
+//     future[FSNOVA] = FOREVER; /* defer supernovas */
     events();  /* Used to avoid if future[FSCMOVE] within time */
 //     future[FSNOVA] = asave;
     /*fails if game over, quadrant super-novas or we've moved to new quadrant*/
@@ -69,7 +69,8 @@ void orbit(void)
     }
     if (plnetx == 0 || abs(sectx-plnetx) > 1 || abs(secty-plnety) > 1) {
        crmshp();
-       prout(" not adjacent to planet.\n");
+       prout(" not adjacent to planet.");
+       skip(1);
        return;
     }
     Time = 0.02+0.03*Rand();
@@ -82,7 +83,7 @@ void orbit(void)
     ididit=1;
 }
 
-void sensor(int force) 
+void sensor(void) 
 {
     skip(1);
     chew();
@@ -90,11 +91,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.",