Deathray is now regressed to original 5% probability in 'plain' games.

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

diff --git a/reports.c b/reports.c
index f169c150e4ddd5bd192887cccb56f2e575169171..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");
@@ -194,11 +193,11 @@ void chart(int nn)
        rechart();
 
     if (lastchart < game.state.date && condit == IHDOCKED) {
-       proutn("Spock-  \"I revised the Star Chart from the starbase's records.\"\n");
+       prout("Spock-  \"I revised the Star Chart from the starbase's records.\"");
        rechart();
     }
 
-    if (nn == 0) proutn("       STAR CHART FOR THE KNOWN GALAXY\n");
+    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));
@@ -226,9 +225,8 @@ void chart(int nn)
                proutn(" ");
        }
        proutn("  |");
-       if (i<GALSIZE) proutn("\n");
+       if (i<GALSIZE) skip(1);
     }
-    prout(""); /* flush output */
 }
 
 static void sectscan(int goodScan, int i, int j) 
@@ -312,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);
@@ -384,7 +382,7 @@ int srscan(int l)
        }
        if (rightside)
            status(jj);
-       if (i<sizeof(requests)/sizeof(requests[0])) proutn("\n");
+       if (i<sizeof(requests)/sizeof(requests[0])) skip(1);
        if (req!=0) return(goodScan);
     }
     prout("");