Renove SERGEEV deoendency from planets.c
authorEric S. Raymond <esr@thyrsus.com>
Thu, 3 Feb 2005 22:56:12 +0000 (22:56 +0000)
committerEric S. Raymond <esr@thyrsus.com>
Thu, 3 Feb 2005 22:56:12 +0000 (22:56 +0000)
planets.c

index 5ed87df431216c5bc03e90e79c361fd5115c15b2..35ccec7550e1cea3585ce59e10900e7e1af2f3cb 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -82,7 +82,6 @@ void orbit(void) {
 }
 
 void sensor(void) {
-#ifndef SERGEEV
        skip(1);
        chew();
        if (game.damage[DSRSENS] != 0.0) {
@@ -90,25 +89,22 @@ void sensor(void) {
                return;
        }
        if (plnetx == 0) {
-               prout("No planet in this quadrant.");
-               return;
+               prout("Spock- \"No planet in this quadrant, Captain.\"");
+               return;
+       }
+       if ((plnetx != 0)&&(game.state.plnets[iplnet].known == 0)) {
+           prout("Spock-  \"Sensor scan for %s-", cramlc(quadrant, quadx, quady));
+           skip(1);
+           prout("         Planet at %s is of class %s.", 
+                  cramlc(sector, plnetx, plnety),
+                  classes[game.state.plnets[iplnet].pclass]);
+           if (game.state.plnets[iplnet].known==shuttle_down) 
+                   prout("         Sensors show Galileo still on surface.");
+           proutn("         Readings indicate");
+           if (game.state.plnets[iplnet].crystals == 0) proutn(" no");
+           prout(" dilithium crystals present.\"");
+           if (game.state.plnets[iplnet].known == unknown) game.state.plnets[iplnet].known = known;
        }
-#else
-    if (game.damage[DSRSENS] != 0.0) return;
-    if ((plnetx != 0)&&(game.state.plnets[iplnet].known == 0)) {
-       prout("Spock-  \"Sensor scan for %s-", cramlc(quadrant, quadx, quady));
-       skip(1);
-       prout("         Planet at %s is of class %s.", 
-              cramlc(sector, plnetx, plnety),
-              classes[game.state.plnets[iplnet].pclass]);
-       if (game.state.plnets[iplnet].known==shuttle_down) 
-               prout("         Sensors show Galileo still on surface.");
-       proutn("         Readings indicate");
-       if (game.state.plnets[iplnet].crystals == 0) proutn(" no");
-       prout(" dilithium crystals present.\"");
-       if (game.state.plnets[iplnet].known == unknown) game.state.plnets[iplnet].known = known;
-    }
-#endif /* SERGEEV */
 }
 
 void beam(void) {