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 3c672186f7d6a9aeb9deec00d80312b05c9fdb7d..b53d0b9f0f66452a3751aef8a3d20625f7bfbe09 100644 (file)
--- a/src/reports.c
+++ b/src/reports.c
@@ -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(".");
@@ -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,
@@ -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