X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Freports.c;h=e1b6cc710cf2e69349d553358961e4e8bb1e9932;hp=22a7cee19eafa012f2036e438a03ea27d75402fd;hb=dc45b3ccf42344c238ddb146d79dc62086624848;hpb=459d6afcbe13be588b29c8bd1fbffb39b13fdee1

diff --git a/src/reports.c b/src/reports.c
index 22a7cee..e1b6cc7 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -316,8 +316,8 @@ static void status(int req)
 	break;
     case 10:
 	if (game.options & OPTION_WORLDS) {
-	    planet *here = game.state.galaxy[game.quadrant.x][game.quadrant.y].planet;
-	    if (here && here->inhabited != UNINHABITED)
+	    int here = game.state.galaxy[game.quadrant.x][game.quadrant.y].planet;
+	    if (here != NOPLANET && game.state.plnets[here].inhabited != UNINHABITED)
 		proutn("Major system  %s", systemname(here));
 	    else
 		proutn("Sector is uninhabited");
@@ -488,7 +488,7 @@ void eta(void)
 	tpower = game.dist*twarp*twarp*twarp*(game.shldup+1);
 	if (tpower >= game.energy) {
 	    prout("Insufficient energy, sir.");
-	    if (game.shldup==0 || tpower > game.energy*2.0) {
+	    if (!game.shldup || tpower > game.energy*2.0) {
 		if (!wfl) return;
 		proutn("New warp factor to try? ");
 		if (scan() == IHREAL) {