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(".");
{
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;
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("<");
);
RQ(9,
- prstat(_("Klingons Left"), "%d", KLINGREM);
+ prstat(_("Klingons Left"), "%d", game.state.remkl + game.state.remcom + game.state.nscrem);
);
RQ(10,
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);
}
-#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