X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Freports.c;h=a0d9bbc26c47fb58c28e02dc29a2928aeae56821;hp=3c672186f7d6a9aeb9deec00d80312b05c9fdb7d;hb=e4ddd3649bf73ddd7a1e2bb32e7ce2e631293068;hpb=b40eba51deeb13f362e95416c005156be4104067

diff --git a/src/reports.c b/src/reports.c
index 3c67218..a0d9bbc 100644
--- 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,