Unscramble some of the trig-formula mess.

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

diff --git a/src/reports.c b/src/reports.c
index e7c433f213a2f5b2be7266b93f2ed9152d183d28..b53d0b9f0f66452a3751aef8a3d20625f7bfbe09 100644 (file)
--- a/src/reports.c
+++ b/src/reports.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-void attakreport(bool curt)
+void attackreport(bool curt)
 /* report status of bases under attack */
 {
     if (!curt) {
@@ -60,10 +60,12 @@ void report(void)
     if (game.tourn)
        prout(_("This is tournament game %d."), game.tourn);
     prout(_("Your secret password is \"%s\""),game.passwd);
-    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)
+    proutn(_("%d of %d Klingons have been killed"), 
+          ((game.inkling + game.incom + game.inscom) - (game.state.remkl + game.state.remcom + game.state.nscrem)), 
+          (game.inkling + game.incom + game.inscom));
+    if (game.incom - game.state.remcom)
+       prout(_(", including %d Commander%s."), game.incom - game.state.remcom, (game.incom - game.state.remcom)==1?"":_("s"));
+    else if (game.inkling - game.state.remkl + (game.inscom - game.state.nscrem) > 0)
        prout(_(", but no Commanders."));
     else
        prout(".");
@@ -82,9 +84,9 @@ void report(void)
     else
        prout(_("There are %d bases."), game.inbase);
     if (!damaged(DRADIO) || game.condition == docked || game.iseenit) {
-       /* Don't report this if not seen and
-          either the radio is dead or not at base! */
-       attakreport(false);
+       // Don't report this if not seen and
+       // either the radio is dead or not at base!
+       attackreport(false);
        game.iseenit = true;
     }
     if (game.casual) 
@@ -166,7 +168,7 @@ void lrscan(void)
     }
 }
 
-void dreprt(void) 
+void damagereport(void) 
 /* damage report */
 {
     bool jdam = false;
@@ -195,8 +197,8 @@ void rechart(void)
 {
     int i, j;
     game.lastchart = game.state.date;
-    for_quadrants(i)
-       for_quadrants(j) 
+    for (i = 1; i <= GALSIZE; i++)
+       for (j = 1; j <= GALSIZE; j++)
            if (game.state.galaxy[i][j].charted) {
                game.state.chart[i][j].klingons = game.state.galaxy[i][j].klingons;
                game.state.chart[i][j].starbase = game.state.galaxy[i][j].starbase;
@@ -223,9 +225,9 @@ void chart(void)
        prout(_("(Last surveillance update %d stardates ago)."),
              (int)(game.state.date-game.lastchart));
     prout("      1    2    3    4    5    6    7    8");
-    for_quadrants(i) {
+    for (i = 1; i <= GALSIZE; i++) {
        proutn("%d |", i);
-       for_quadrants(j) {
+       for (j = 1; j <= GALSIZE; j++) {
            char buf[4];
            if ((game.options & OPTION_SHOWME) && i == game.quadrant.x && j == game.quadrant.y)
                proutn("<");
@@ -344,7 +346,7 @@ void status(int req)
     );
 
     RQ(9,
-        prstat(_("Klingons Left"), "%d", KLINGREM);
+        prstat(_("Klingons Left"), "%d", game.state.remkl + game.state.remcom + game.state.nscrem);
     );
 
     RQ(10,
@@ -358,7 +360,7 @@ void status(int req)
     );
 
     RQ(11,
-       attakreport(!req);
+       attackreport(!req);
     );
 
 #undef RQ
@@ -412,7 +414,7 @@ void srscan(void)
        newcnd();
     for (i = 1; i <= QUADSIZE; i++) {
        proutn("%2d  ", i);
-       for_sectors(j) {
+       for (j = 1; j <= QUADSIZE; j++) {
            sectscan(goodScan, i, j);
        }
        skip(1);
@@ -574,7 +576,7 @@ void eta(void)
                        
 }
 
-#if BSD_BUG_FOR_BUG
+#ifdef BSD_BUG_FOR_BUG
 /*
  *     A visual scan is made in a particular direction of three sectors
  *     in the general direction specified.  This takes time, and