Other half of eta-check fix.

[super-star-trek.git] / src / reports.c

diff --git a/src/reports.c b/src/reports.c
index 0948073b01a4d6a2e88bd7573184ed9d51012a94..6d58c7f21e299d2cff2eea1ec782d5bc832c6e5a 100644 (file)
--- a/src/reports.c
+++ b/src/reports.c
@@ -227,6 +227,7 @@ void chart(int nn)
        proutn("  |");
        if (i<GALSIZE) skip(1);
     }
+    prout("");
 }
 
 static void sectscan(int goodScan, int i, int j) 
@@ -313,6 +314,16 @@ static void status(int req)
        proutn("Klingons Left %d", KLINGREM);
        break;
     case 10:
+       if (game.options & OPTION_WORLDS) {
+           planet *here = game.state.galaxy[game.quadx][game.quady].planet;
+           if (here && here->inhabited != UNINHABITED)
+               proutn("Major system  %s", systemname(here));
+           else
+               proutn("Sector is uninhabited");
+       }
+
+       break;
+    case 11:
        attakreport(1);
        break;
     }
@@ -320,8 +331,9 @@ static void status(int req)
                
 int srscan(int l) 
 {
+    /* the "sy" request is undocumented */
     static char requests[][3] =
-       {"","da","co","po","ls","wa","en","to","sh","kl","ti"};
+       {"","da","co","po","ls","wa","en","to","sh","kl","sy", "ti"};
     int leftside=TRUE, rightside=TRUE, i, j, jj, req=0, nn=FALSE;
     int goodScan=TRUE;
     switch (l) {
@@ -358,7 +370,7 @@ int srscan(int l)
        if (req > sizeof(requests)/sizeof(requests[0])) {
            prout("UNRECOGNIZED REQUEST. Legal requests are:");
            prout("  date, condition, position, lsupport, warpfactor,");
-           prout("  energy, torpedoes, shields, klingons, time, bases.");
+           prout("  energy, torpedoes, shields, klingons, time, system, bases.");
            return FALSE;
        }
        // no break
@@ -514,9 +526,9 @@ void eta(void)
            prout("Unfortunately, the Federation will be destroyed by then.");
        if (twarp > 6.0)
            prout("You'll be taking risks at that speed, Captain");
-       if ((game.isatb==1 && game.state.isy == ix1 && game.state.isx == iy1 &&
+       if ((game.isatb==1 && game.state.isy == iy1 && game.state.isx == ix1 &&
             game.future[FSCDBAS]< ttime+game.state.date)||
-           (game.future[FCDBAS]<ttime+game.state.date && game.baty==ix1 && game.batx == iy1))
+           (game.future[FCDBAS]<ttime+game.state.date && game.baty==iy1 && game.baty == iy1))
            prout("The starbase there will be destroyed by then.");
        proutn("New warp factor to try? ");
        if (scan() == IHREAL) {