X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=planets.c;h=9e847ebe0e92c0b1601bd6e6d6af6b6c2f2c2160;hp=69ca3271c2e32ae9e4b35dd518384e8b5538b2b6;hb=f1af4f83e663d93c704ce0ada75ea4aa9ae3c65b;hpb=5b0cc4a8a21c3d66e5a43abdb06f37df2d525e08

diff --git a/planets.c b/planets.c
index 69ca327..9e847eb 100644
--- a/planets.c
+++ b/planets.c
@@ -1,7 +1,5 @@
 #include "sst.h"
 
-static int height;
-
 static char *classes[] = {"M","N","O"};
 
 static int consumeTime(void) 
@@ -19,11 +17,11 @@ 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*/
-    if (alldone || game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE || justin != 0) return 1;
+    if (alldone || game.state.galaxy[quadx][quady].supernova || justin != 0) return 1;
     return 0;
 }
 
@@ -71,20 +69,21 @@ void orbit(void)
     }
     if (plnetx == 0 || abs(sectx-plnetx) > 1 || abs(secty-plnety) > 1) {
 	crmshp();
-	prout(" not adjacient to planet.\n");
+	prout(" not adjacent to planet.");
+	skip(1);
 	return;
     }
     Time = 0.02+0.03*Rand();
     prout("Helmsman Sulu-  \"Entering standard orbit, Sir.\"");
     newcnd();
     if (consumeTime()) return;
-    height = (1400.+7200.*Rand());
-    prout("Sulu-  \"Entered orbit at altitude %.2f kilometers.\"", height);
+    game.height = (1400.0+7200.0*Rand());
+    prout("Sulu-  \"Entered orbit at altitude %.2f kilometers.\"", game.height);
     inorbit = 1;
     ididit=1;
 }
 
-void sensor(int force) 
+void sensor(void) 
 {
     skip(1);
     chew();
@@ -92,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.", 
@@ -319,7 +318,7 @@ void shuttle(void)
 	prout("  you may not fly down.\"");
 	return;
     }
-    Time = 3.0e-5*height;
+    Time = 3.0e-5*game.height;
     if (Time >= 0.8*game.state.remtime) {
 	prout("First Officer Spock-  \"Captain, I compute that such");
 	proutn("  a maneuver would require approximately 2d%% of our",
@@ -484,8 +483,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*.");