X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fplanets.c;h=8aba37c3f07288916d68f16720169a55c591169f;hp=a34b1f694b06b0c68a4f2faf5de49fc2875524d7;hb=2c5438d3c22fe863ad8054d214f2afdd061ad43a;hpb=f5a89916bc70a66b6fa6a3abc4c36023503cd380

diff --git a/src/planets.c b/src/planets.c
index a34b1f6..8aba37c 100644
--- a/src/planets.c
+++ b/src/planets.c
@@ -12,7 +12,7 @@ static bool consumeTime(void)
     return false;
 }
 
-void preport(void) 
+void survey(void) 
 /* report on (uninhabited) planets in the galaxy */
 {
     bool iknow = false;
@@ -22,24 +22,27 @@ void preport(void)
     prout(_("Spock-  \"Planet report follows, Captain.\""));
     skip(1);
     for (i = 0; i < game.inplan; i++) {
-	if ((game.state.plnets[i].known != unknown
-	    && game.state.plnets[i].crystals != absent)
-	    || (idebug && game.state.plnets[i].w.x !=0)
-	    ) {
+	if (game.state.planets[i].pclass == destroyed)
+	    continue;
+	if ((game.state.planets[i].known != unknown
+	     && game.state.planets[i].inhabited == UNINHABITED)
+	    || idebug) {
 	    iknow = true;
-	    if (idebug && game.state.plnets[i].known==unknown)
+	    if (idebug && game.state.planets[i].known==unknown)
 		proutn("(Unknown) ");
-	    proutn(cramlc(quadrant, game.state.plnets[i].w));
+	    proutn(cramlc(quadrant, game.state.planets[i].w));
 	    proutn(_("   class "));
-	    proutn(classes[game.state.plnets[i].pclass]);
+	    proutn(classes[game.state.planets[i].pclass]);
 	    proutn("   ");
-	    if (game.state.plnets[i].crystals != present) proutn(_("no "));
+	    if (game.state.planets[i].crystals != present)
+		proutn(_("no "));
 	    prout(_("dilithium crystals present."));
-	    if (game.state.plnets[i].known==shuttle_down) 
+	    if (game.state.planets[i].known==shuttle_down) 
 		prout(_("    Shuttle Craft Galileo on surface."));
 	}
     }
-    if (!iknow) prout(_("No information available."));
+    if (!iknow)
+	prout(_("No information available."));
 }
 
 void orbit(void)
@@ -55,7 +58,7 @@ void orbit(void)
 	prout(_("Both warp and impulse engines damaged."));
 	return;
     }
-    if (game.plnet.x == 0 || abs(game.sector.x-game.plnet.x) > 1 || abs(game.sector.y-game.plnet.y) > 1) {
+    if (!is_valid(game.plnet) || abs(game.sector.x-game.plnet.x) > 1 || abs(game.sector.y-game.plnet.y) > 1) {
 	crmshp();
 	prout(_(" not adjacent to planet."));
 	skip(1);
@@ -64,7 +67,8 @@ void orbit(void)
     game.optime = 0.02+0.03*Rand();
     prout(_("Helmsman Sulu-  \"Entering standard orbit, Sir.\""));
     newcnd();
-    if (consumeTime()) return;
+    if (consumeTime())
+	return;
     game.height = (1400.0+7200.0*Rand());
     prout(_("Sulu-  \"Entered orbit at altitude %.2f kilometers.\""), game.height);
     game.inorbit = true;
@@ -84,18 +88,20 @@ void sensor(void)
 	prout(_("Spock- \"No planet in this quadrant, Captain.\""));
 	return;
     }
-    if ((game.plnet.x != 0)&& (game.state.plnets[game.iplnet].known == unknown)) {
+    if ((game.plnet.x != 0)&& (game.state.planets[game.iplnet].known == unknown)) {
 	prout(_("Spock-  \"Sensor scan for %s-"), cramlc(quadrant, game.quadrant));
 	skip(1);
 	prout(_("         Planet at %s is of class %s."),
 	      cramlc(sector,game.plnet),
-	      classes[game.state.plnets[game.iplnet].pclass]);
-	if (game.state.plnets[game.iplnet].known==shuttle_down) 
+	      classes[game.state.planets[game.iplnet].pclass]);
+	if (game.state.planets[game.iplnet].known==shuttle_down) 
 	    prout(_("         Sensors show Galileo still on surface."));
 	proutn(_("         Readings indicate"));
-	if (game.state.plnets[game.iplnet].crystals != present) proutn(_(" no"));
+	if (game.state.planets[game.iplnet].crystals != present)
+	    proutn(_(" no"));
 	prout(_(" dilithium crystals present.\""));
-	if (game.state.plnets[game.iplnet].known == unknown) game.state.plnets[game.iplnet].known = known;
+	if (game.state.planets[game.iplnet].known == unknown)
+	    game.state.planets[game.iplnet].known = known;
     }
 }
 
@@ -106,10 +112,11 @@ void beam(void)
     skip(1);
     if (damaged(DTRANSP)) {
 	prout(_("Transporter damaged."));
-	if (!damaged(DSHUTTL) && (game.state.plnets[game.iplnet].known==shuttle_down || game.iscraft == onship)) {
+	if (!damaged(DSHUTTL) && (game.state.planets[game.iplnet].known==shuttle_down || game.iscraft == onship)) {
 	    skip(1);
 	    proutn(_("Spock-  \"May I suggest the shuttle craft, Sir?\" "));
-	    if (ja() == true) shuttle();
+	    if (ja() == true)
+		shuttle();
 	}
 	return;
     }
@@ -122,7 +129,7 @@ void beam(void)
 	prout(_("Impossible to transport through shields."));
 	return;
     }
-    if (game.state.plnets[game.iplnet].known==unknown) {
+    if (game.state.planets[game.iplnet].known==unknown) {
 	prout(_("Spock-  \"Captain, we have no information on this planet"));
 	prout(_("  and Starfleet Regulations clearly state that in this situation"));
 	prout(_("  you may not go down.\""));
@@ -130,7 +137,7 @@ void beam(void)
     }
     if (game.landed) {
 	/* Coming from planet */
-	if (game.state.plnets[game.iplnet].known==shuttle_down) {
+	if (game.state.planets[game.iplnet].known==shuttle_down) {
 	    proutn(_("Spock-  \"Wouldn't you rather take the Galileo?\" "));
 	    if (ja() == true) {
 		chew();
@@ -147,7 +154,7 @@ void beam(void)
     }
     else {
 	/* Going to planet */
-	if (game.state.plnets[game.iplnet].crystals==absent) {
+	if (game.state.planets[game.iplnet].crystals==absent) {
 	    prout(_("Spock-  \"Captain, I fail to see the logic in"));
 	    prout(_("  exploring a planet with no dilithium crystals."));
 	    proutn(_("  Are you sure this is wise?\" "));
@@ -177,7 +184,7 @@ void beam(void)
     skip(2);
     prout(_("Transport complete."));
     game.landed = !game.landed;
-    if (game.landed && game.state.plnets[game.iplnet].known==shuttle_down) {
+    if (game.landed && game.state.planets[game.iplnet].known==shuttle_down) {
 	prout(_("The shuttle craft Galileo is here!"));
     }
     if (!game.landed && game.imine) {
@@ -197,11 +204,11 @@ void mine(void)
 	prout(_("Mining party not on planet."));
 	return;
     }
-    if (game.state.plnets[game.iplnet].crystals == mined) {
+    if (game.state.planets[game.iplnet].crystals == mined) {
 	prout(_("This planet has already been strip-mined for dilithium."));
 	return;
     }
-    else if (game.state.plnets[game.iplnet].crystals == absent) {
+    else if (game.state.planets[game.iplnet].crystals == absent) {
 	prout(_("No dilithium crystals on this planet."));
 	return;
     }
@@ -216,10 +223,11 @@ void mine(void)
 	prout(_("there's no reason to mine more at this time."));
 	return;
     }
-    game.optime = (0.1+0.2*Rand())*game.state.plnets[game.iplnet].pclass;
-    if (consumeTime()) return;
+    game.optime = (0.1+0.2*Rand())*game.state.planets[game.iplnet].pclass;
+    if (consumeTime())
+	return;
     prout(_("Mining operation complete."));
-    game.state.plnets[game.iplnet].crystals = mined;
+    game.state.planets[game.iplnet].crystals = mined;
     game.imine = game.ididit = true;
 }
 
@@ -282,7 +290,7 @@ void shuttle(void)
     skip(1);
     if(damaged(DSHUTTL)) {
 	if (game.damage[DSHUTTL] == -1.0) {
-	    if (game.inorbit && game.state.plnets[game.iplnet].known == shuttle_down)
+	    if (game.inorbit && game.state.planets[game.iplnet].known == shuttle_down)
 		prout(_("Ye Faerie Queene has no shuttle craft bay to dock it at."));
 	    else
 		prout(_("Ye Faerie Queene had no shuttle craft."));
@@ -298,11 +306,11 @@ void shuttle(void)
 	prout(_(" not in standard orbit."));
 	return;
     }
-    if ((game.state.plnets[game.iplnet].known != shuttle_down) && game.iscraft != onship) {
+    if ((game.state.planets[game.iplnet].known != shuttle_down) && game.iscraft != onship) {
 	prout(_("Shuttle craft not currently available."));
 	return;
     }
-    if (!game.landed && game.state.plnets[game.iplnet].known==shuttle_down) {
+    if (!game.landed && game.state.planets[game.iplnet].known==shuttle_down) {
 	prout(_("You will have to beam down to retrieve the shuttle craft."));
 	return;
     }
@@ -310,7 +318,7 @@ void shuttle(void)
 	prout(_("Shuttle craft cannot pass through shields."));
 	return;
     }
-    if (game.state.plnets[game.iplnet].known==unknown) {
+    if (game.state.planets[game.iplnet].known==unknown) {
 	prout(_("Spock-  \"Captain, we have no information on this planet"));
 	prout(_("  and Starfleet Regulations clearly state that in this situation"));
 	prout(_("  you may not fly down.\""));
@@ -345,8 +353,9 @@ void shuttle(void)
 	    prout(_(" boards Galileo and swoops toward planet surface."));
 	    game.iscraft = offship;
 	    skip(1);
-	    if (consumeTime()) return;
-	    game.state.plnets[game.iplnet].known=shuttle_down;
+	    if (consumeTime())
+		return;
+	    game.state.planets[game.iplnet].known=shuttle_down;
 	    prout(_("Trip complete."));
 	    return;
 	}
@@ -356,11 +365,12 @@ void shuttle(void)
 	    prout(_("shuttle craft for the trip back to the Enterprise."));
 	    skip(1);
 	    prout(_("The short hop begins . . ."));
-	    game.state.plnets[game.iplnet].known=known;
+	    game.state.planets[game.iplnet].known=known;
 	    game.icraft = true;
 	    skip(1);
 	    game.landed = false;
-	    if (consumeTime()) return;
+	    if (consumeTime())
+		return;
 	    game.iscraft = onship;
 	    game.icraft = false;
 	    if (game.imine) {
@@ -382,11 +392,12 @@ void shuttle(void)
 	skip(1);
 	game.icraft = true;
 	game.iscraft = offship;
-	if (consumeTime()) return;
-	game.state.plnets[game.iplnet].known = shuttle_down;
+	if (consumeTime())
+	    return;
+	game.state.planets[game.iplnet].known = shuttle_down;
 	game.landed = true;
 	game.icraft = false;
-	prout(_("Trip complete"));
+	prout(_("Trip complete."));
 	return;
     }
 }
@@ -414,7 +425,8 @@ void deathray(void)
     prout(_("Spock-  \"Captain, the 'Experimental Death Ray'"));
     prout(_("  is highly unpredictible.  Considering the alternatives,"));
     proutn(_("  are you sure this is wise?\" "));
-    if (ja() == false) return;
+    if (ja() == false)
+	return;
     prout(_("Spock-  \"Acknowledged.\""));
     skip(1);
     game.ididit = true;
@@ -438,7 +450,8 @@ 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) finish(FWON);
+	if (KLINGREM == 0)
+	    finish(FWON);    
 	if ((game.options & OPTION_PLAIN) == 0) {
 	    prout(_("Spock-  \"Captain, I believe the `Experimental Death Ray'"));
 	    if (Rand() <= 0.05) {
@@ -487,9 +500,10 @@ void deathray(void)
 	proutn(_("Spock-  \"I believe the word is"));
 	prouts(_(" *ASTONISHING*"));
 	prout(_(" Mr. Sulu."));
-	for_sectors(i)
-	    for_sectors(j)
-		if (game.quad[i][j] == IHDOT) game.quad[i][j] = IHQUEST;
+	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"));
 	prouts(_(" - - - - - -  *THINGS*."));
 	skip(1);