(cens, cens_hdr): Column fall used to be shown only with FALLOUT.

Show it always.

diff --git a/info/census.t b/info/census.t
index bd00d70ab6f9e8466d870da73b2ccc1ab8de81cd..3a7e0f5d856fdac11b0565b2cedf7c2e4e0c66fd 100644 (file)
--- a/info/census.t
+++ b/info/census.t
@@ -18,7 +18,7 @@ A census lists each of your sectors in the specified area headed by:
 .NF
 Tue Oct 10 22:24:49 1995
 CENSUS                   del dst
-  sect        eff prd mob uf uf *  civ  mil   uw food work avail ter coast
+  sect        eff prd mob uf uf old  civ  mil   uw food work avail ter fall coa
 .FI
 These columns represent:
 .s1
@@ -39,8 +39,8 @@ uncompensated workers and food.
 .L uf
 Two \*Qdistribute\*U columns corresponding to:
 uncompensated workers and food.
-.L *
-occupied enemy sector.
+.L old
+the old owner of an occupied enemy sector.
 .L civ
 the number of civilians
 .L mil
@@ -58,29 +58,27 @@ or maintenance of planes, ships, or nukes.
 .L ter
 This is a territory for the sector that you can specify using the
 \*Qterritory\*U command.
+.L fall
+radioactive contamination due to nuclear fallout
 .L coast
-Is this a coastal sector?  Note that the "coastal flag" gets set for
-the sector only when you use the census command, so if you want to
-query your sectors depending on whether they're coastal, then you may
-need to do a census twice--the first time to set the coastal flags,
-and the second time to query them.
+Is this a coastal sector?
 .in
 .s1
 For example:
 .EX cens #0
 .NF
 Tue Jun 20 00:33:43 1989
-CENSUS                  del dst
-  sect       eff prd mob uf uf *  civ  mil   uw food work avail ter
-   2,-2  f  100%       8 .. ..      0  499    0    0   0%   64
-  -1,-1  f  100%      32 .. ..    629    0    0  970  43%   31    3
-   1,-1  n  100%   n  31 ..       627    0    0  970  51%   30
-   3,-1  )  100%      32 .. ..      0    0    0    0   0%    0
-  -2,0   h  100%      32 .. ..    629    0    0  970 100%   93   50
-   0,0   *  100%     114 .. ..    906  845    0  729 100%  173   50
-   2,0   c  100%     127 .. ..    154  100  124   71 100%   49
-   1,1   -    0%      32 .. ..      1    0    0    0   0%    0
-    8 sectors
+CENSUS                   del dst
+  sect        eff prd mob uf uf old  civ  mil   uw food work avail ter fall coa
+   2,-2   f  100%       8 .. ..        0  499    0    0   0%   64        0
+  -1,-1   f  100%      32 .. ..      629    0    0  970  43%   31    3   0
+   1,-1   n  100%   n  31 ..         627    0    0  970  51%   30        0
+   3,-1   )  100%      32 .. ..        0    0    0    0   0%    0        0
+  -2,0    h  100%      32 .. ..      629    0    0  970 100%   93   50   0   1
+   0,0    *  100%     114 .. ..      906  845    0  729 100%  173   50   0
+   2,0    c  100%     127 .. ..      154  100  124   71 100%   49        0
+   1,1    -    0%      32 .. ..        1    0    0    0   0%    0        0
+8 sectors
 .FI
 .s1
 .SA "improve, sinfrastructure, commodity, resource, level, territory, cutoff, map, start, stop, Sectors, Populace, Commodities"

diff --git a/src/lib/commands/cens.c b/src/lib/commands/cens.c
index 811fc1c41e68fea04c2d55d8372265433d726fa2..b631408732ad3bfee33b7cb6c935fffb5b13f017 100644 (file)
--- a/src/lib/commands/cens.c
+++ b/src/lib/commands/cens.c
@@ -103,9 +103,7 @@ cens(void)
            else
                pr("    ");
        }
-       if (opt_FALLOUT) {
-           pr("%5d", sect.sct_fallout);
-       }
+       pr("%5d", opt_FALLOUT ? sect.sct_fallout : 0);
        if (sect.sct_coastal)
            pr("%4d", sect.sct_coastal);
        pr("\n");
@@ -134,9 +132,6 @@ cens_hdr(void)
     pr("mob uf uf old  civ  mil   uw food work avail ");
     if (!player->god)
        pr("ter ");
-    if (opt_FALLOUT)
-       pr("fall ");
-    pr("coa");
-    pr("\n");
+    pr("fall coa\n");
 }