Use relations_with() for US==THEM || getrel(NP, THEM)

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

diff --git a/src/lib/commands/coun.c b/src/lib/commands/coun.c
index 2e2780439a02d536ae6d5496b6f41aeb7f1bf543..c6a3fe8deb563785ef6781c7e26e436c144464f5 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-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,98 +19,88 @@
  *
  *  ---
  *
- *  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 "var.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "deity.h"
-#include <fcntl.h>
-#include <ctype.h>
+#include <config.h>
+
 #include "commands.h"
+#include "optlist.h"
 
-static void coun_header(void);
-static void coun_list(natid cn, struct natstr *natp);
+static void coun_list(struct natstr *natp);
 
 int
 coun(void)
 {
-       struct  nstr_item ni;
-       struct  natstr nat;
-       int     first;
+    struct nstr_item ni;
+    struct natstr nat;
 
-       pr("The 'country' command is temporarily out of order.\n");
-       pr("Please use the 'players' command instead.\n");
-       if (!snxtitem(&ni, EF_NATION, player->argp[1]))
-               return RET_SYN;
-       first = 1;
-       while (nxtitem(&ni, (s_char *)&nat)) {
-               if ((nat.nat_stat & STAT_INUSE) == 0)
-                       continue;
-               if (((nat.nat_stat & GOD) != GOD) && !player->god)
-                       continue;
-               if (first) {
-                       coun_header();
-                       first = 0;
-               }
-               coun_list((natid)ni.cur, &nat);
-       }
-       return RET_OK;
+    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_UNUSED)
+           continue;
+       coun_list(&nat);
+    }
+    return RET_OK;
 }
 
 static void
-coun_header(void)
+coun_list(struct natstr *natp)
 {
-       prdate();
-       pr("  #   last access       time\tstatus\t\t country name\n");
-}
+    char *status;
+    natid cn = natp->nat_cnum;
 
-static void
-coun_list(natid cn, struct natstr *natp)
-{
-       s_char  *status;
-       struct  sctstr sect;
+    pr("%3d  ", cn);
+
+    if (getplayer(cn)
+       && (player->god
+           || 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                   ");
+       else {
+           pr("%.16s - ", ctime(&natp->nat_last_login));
+           pr("%-16.16s",
+              natp->nat_last_login <= natp->nat_last_logout
+              ? ctime(&natp->nat_last_logout) : "?");
+       }
+    } else
+       pr(" Unknown                           ");
 
-       if (natp->nat_connected)
-               pr("%3d  %-16.16s   [%d]",cn," Now logged on",
-                       natp->nat_btu);
-       else
-               pr("%3d  %-16.16s   [%d]", cn, ctime(&natp->nat_last_login),
-                       natp->nat_btu);
+    if (player->god)
+       pr(" %4d", natp->nat_btu);
 
-       if (natp->nat_stat & STAT_GOD)
-               status = "DEITY";
-       else if (natp->nat_stat & STAT_NEW)
-               status = "New";
-       else if (natp->nat_stat & STAT_SANCT)
-               status = "Sanctuary";
-       else if (natp->nat_stat & STAT_NORM) {
-               getsect(natp->nat_xcap, natp->nat_ycap, &sect);
-               if (sect.sct_own != cn ||
-                   (sect.sct_type != SCT_CAPIT &&
-                   sect.sct_type != SCT_MOUNT))
-                       status = "In flux";
-               else if (natp->nat_money < 0)
-                       status = "Broke";
-               else
-                       status = "Active";
-       } else {
-               status = "Visitor";
+    if (natp->nat_stat == STAT_GOD)
+       status = "DEITY";
+    else if (natp->nat_stat == STAT_NEW)
+       status = "New";
+    else if (natp->nat_stat == STAT_SANCT)
+       status = "Sanctuary";
+    else if (natp->nat_stat == STAT_ACTIVE) {
+       status = "Active";
+       if (!opt_HIDDEN || player->god) {
+           if (influx(natp))
+               status = "In flux";
+           else if (natp->nat_money < 0)
+               status = "Broke";
        }
-       pr("\t%-9.9s\t %s\n", status, natp->nat_cnam);
+    } else {
+       status = "Visitor";
+    }
+    pr("  %-9.9s  %s\n", status, natp->nat_cnam);
 }