License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/coun.c b/src/lib/commands/coun.c
index 9e0e57dbab2c71c81f96b2d15b1fd8af4a08d083..e3acce117678d2f6bc1cf6a324bed0fc83c4c90f 100644 (file)
--- a/src/lib/commands/coun.c
+++ b/src/lib/commands/coun.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,32 +14,24 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  coun.c: Do a country roster
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include <fcntl.h>
-#include <ctype.h>
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
 
@@ -51,13 +43,13 @@ coun(void)
     struct nstr_item ni;
     struct natstr nat;
 
-    if (!snxtitem(&ni, EF_NATION, player->argp[1]))
+    if (!snxtitem(&ni, EF_NATION, player->argp[1], NULL))
        return RET_SYN;
     prdate();
     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);
     }
@@ -68,16 +60,15 @@ static void
 coun_list(struct natstr *natp)
 {
     char *status;
-    struct sctstr sect;
     natid cn = natp->nat_cnum;
 
     pr("%3d  ", cn);
 
     if (getplayer(cn)
        && (player->god
-           || (natp->nat_stat & STAT_GOD)
-           || cn == player->cnum || getrel(natp, player->cnum) == ALLIED))
-        pr(" Now logged on                     ");
+           || natp->nat_stat == STAT_GOD
+           || relations_with(cn, player->cnum) == ALLIED))
+       pr(" Now logged on                     ");
     else if (player->god) {
        if (natp->nat_last_login == 0)
            pr(" Never logged on                   ");
@@ -93,18 +84,16 @@ 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) {
-           getsect(natp->nat_xcap, natp->nat_ycap, &sect);
-           if (sect.sct_own != cn ||
-               (sect.sct_type != SCT_CAPIT && sect.sct_type != SCT_MOUNT))
+           if (influx(natp))
                status = "In flux";
            else if (natp->nat_money < 0)
                status = "Broke";