Experimental X code

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

diff --git a/reports.c b/reports.c
index ed1a14420e049d0e167a7657fa9650fde64ba186..f0dc134eb88d29d975e7cb753952030d2882ef97 100644 (file)
--- a/reports.c
+++ b/reports.c
@@ -54,10 +54,9 @@ void report(void)
     if (skill>SKILL_GOOD && thawed && !alldone) prout("No plaque is allowed.");
     if (tourn) prout("This is tournament game %d.", tourn);
     prout("Your secret password is \"%s\"",game.passwd);
-    proutn("%d of %d Klingons have been killed",
-          game.state.killk+game.state.killc+game.state.nsckill, inkling);
-    if (game.state.killc) prout(", including %d Commander%s.", game.state.killc, game.state.killc==1?"":"s");
-    else if (game.state.killk+game.state.nsckill > 0) prout(", but no Commanders.");
+    proutn("%d of %d Klingons have been killed", KLINGKILLED, INKLINGTOT);
+    if (NKILLC) prout(", including %d Commander%s.", NKILLC, NKILLC==1?"":"s");
+    else if (NKILLK + NKILLSC > 0) prout(", but no Commanders.");
     else prout(".");
     if (skill > SKILL_FAIR) prout("The Super Commander has %sbeen destroyed.",
                                  game.state.nscrem?"not ":"");
@@ -124,7 +123,7 @@ void lrscan(void)
            prout("LONG-RANGE SENSORS DAMAGED.");
            return;
        }
-       proutn("Starbase's long-range scan");
+       prout("Starbase's long-range scan");
     }
     else {
        prout("Long-range scan");
@@ -188,18 +187,17 @@ void rechart(void)
 void chart(int nn) 
 {
     int i,j;
-    char *cp;
     chew();
 
     if (game.damage[DRADIO] == 0.0)
        rechart();
 
     if (lastchart < game.state.date && condit == IHDOCKED) {
-       proutn("Spock-  \"I revised the Star Chart from the starbase's records.\"\n\r");
+       prout("Spock-  \"I revised the Star Chart from the starbase's records.\"");
        rechart();
     }
 
-    if (nn == 0) proutn("       STAR CHART FOR THE KNOWN GALAXY\n\r");
+    if (nn == 0) prout("       STAR CHART FOR THE KNOWN GALAXY");
     if (game.state.date > lastchart)
        prout("(Last surveillance update %d stardates ago).",
              (int)(game.state.date-lastchart));
@@ -208,7 +206,7 @@ void chart(int nn)
        proutn("%d |", i);
        for_quadrants(j) {
            char buf[4];
-           if ((game.options & OPTION_SHOWME) && i == quady && j == quadx)
+           if ((game.options & OPTION_SHOWME) && i == quadx && j == quady)
                proutn("<");
            else
                proutn(" ");
@@ -217,22 +215,18 @@ void chart(int nn)
            else if (!game.state.galaxy[i][j].charted && game.state.galaxy[i][j].starbase)
                strcpy(buf, ".1.");
            else if (game.state.galaxy[i][j].charted)
-               sprintf(buf, "%d%d%d", game.state.chart[i][j].klingons, game.state.chart[i][j].starbase, game.state.chart[i][j].stars);
+               sprintf(buf, "%3d", game.state.chart[i][j].klingons*100 + game.state.chart[i][j].starbase * 10 + game.state.chart[i][j].stars);
            else
                strcpy(buf, "...");
-           for (cp = buf; cp < buf + sizeof(buf); cp++)
-               if (*cp == '0')
-                   *cp = '.';
            proutn(buf);
-           if ((game.options & OPTION_SHOWME) && i == quady && j == quadx)
+           if ((game.options & OPTION_SHOWME) && i == quadx && j == quady)
                proutn(">");
            else
                proutn(" ");
        }
        proutn("  |");
-       if (i<GALSIZE) proutn("\n\r");
+       if (i<GALSIZE) skip(1);
     }
-    prout(""); /* flush output */
 }
 
 static void sectscan(int goodScan, int i, int j) 
@@ -249,9 +243,7 @@ static void sectscan(int goodScan, int i, int j)
            if (game.quad[i][j] != ship) 
                highvideo();
        }
-       if (game.quad[i][j] & DAMAGED) 
-           highvideo();
-       proutn("%c ",game.quad[i][j] & ~DAMAGED);
+       proutn("%c ",game.quad[i][j]);
        textcolor(DEFAULT);
     }
     else
@@ -318,7 +310,7 @@ static void status(int req)
               (int)((100.0*shield)/inshld + 0.5), shield);
        break;
     case 9:
-       proutn("Klingons Left %d", game.state.remkl);
+       proutn("Klingons Left %d", KLINGREM);
        break;
     case 10:
        attakreport(1);
@@ -343,7 +335,7 @@ int srscan(int l)
            else
                prout("  [Using Base's sensors]");
        }
-       else proutn("     Short-range scan\n\r");
+       else prout("     Short-range scan");
        if (goodScan && !game.damage[DRADIO]) { 
            game.state.chart[quadx][quady].klingons = game.state.galaxy[quadx][quady].klingons;
            game.state.chart[quadx][quady].starbase = game.state.galaxy[quadx][quady].starbase;
@@ -354,7 +346,7 @@ int srscan(int l)
        if (isit("chart")) nn = TRUE;
        if (isit("no")) rightside = FALSE;
        chew();
-       proutn("    1 2 3 4 5 6 7 8 9 10\n\r");
+       prout("    1 2 3 4 5 6 7 8 9 10");
        break;
     case SCAN_REQUEST:
        while (scan() == IHEOL)
@@ -364,9 +356,9 @@ int srscan(int l)
            if (strncmp(citem,requests[req],min(2,strlen(citem)))==0)
                break;
        if (req > sizeof(requests)/sizeof(requests[0])) {
-           prout("UNRECOGNIZED REQUEST. Legal requests are:\n"
-                 "  date, condition, position, lsupport, warpfactor,\n"
-                 "  energy, torpedoes, shields, klingons, time, bases.");
+           prout("UNRECOGNIZED REQUEST. Legal requests are:");
+           prout("  date, condition, position, lsupport, warpfactor,");
+           prout("  energy, torpedoes, shields, klingons, time, bases.");
            return FALSE;
        }
        // no break
@@ -390,7 +382,7 @@ int srscan(int l)
        }
        if (rightside)
            status(jj);
-       if (i<sizeof(requests)/sizeof(requests[0])) proutn("\n\r");
+       if (i<sizeof(requests)/sizeof(requests[0])) skip(1);
        if (req!=0) return(goodScan);
     }
     prout("");