COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / commands / coun.c

diff --git a/src/lib/commands/coun.c b/src/lib/commands/coun.c
index 52c8f221639e2814f2d716ac74c173fc710070b4..c9c7154d3e18177ceadf9a7b342494c2ef05ab2b 100644 (file)
--- a/src/lib/commands/coun.c
+++ b/src/lib/commands/coun.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -31,6 +31,8 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
 #include "sect.h"
@@ -57,7 +59,7 @@ coun(void)
     pr("  #   last access                         %sstatus     country name\n",
        player->god ? "BTU  " : "");
     while (nxtitem(&ni, &nat)) {
-       if ((nat.nat_stat & STAT_INUSE) == 0)
+       if (nat.nat_stat == STAT_UNUSED)
            continue;
        coun_list(&nat);
     }
@@ -74,7 +76,7 @@ coun_list(struct natstr *natp)
 
     if (getplayer(cn)
        && (player->god
-           || (natp->nat_stat & STAT_GOD)
+           || natp->nat_stat == STAT_GOD
            || cn == player->cnum || getrel(natp, player->cnum) == ALLIED))
         pr(" Now logged on                     ");
     else if (player->god) {
@@ -92,13 +94,13 @@ coun_list(struct natstr *natp)
     if (player->god)
        pr(" %4d", natp->nat_btu);
 
-    if (natp->nat_stat & STAT_GOD)
+    if (natp->nat_stat == STAT_GOD)
        status = "DEITY";
-    else if (natp->nat_stat & STAT_NEW)
+    else if (natp->nat_stat == STAT_NEW)
        status = "New";
-    else if (natp->nat_stat & STAT_SANCT)
+    else if (natp->nat_stat == STAT_SANCT)
        status = "Sanctuary";
-    else if (natp->nat_stat & STAT_NORM) {
+    else if (natp->nat_stat == STAT_ACTIVE) {
        status = "Active";
        if (!opt_HIDDEN || player->god) {
            if (influx(natp))