Update copyright notice

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

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index 9036afe03b9a5572897cf1cdb8ba18d2374db1c2..1a0fdbf8a8972cdf5a6218c3ae2c81175e935dba 100644 (file)
--- a/src/lib/commands/acce.c
+++ b/src/lib/commands/acce.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-2008, 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,11 +31,8 @@
  *     
  */
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
 
@@ -51,38 +48,26 @@ acce(void)
     struct natstr *np;
     natid cn;
     natid as;
-    int n;
 
-    if (player->argp[1] == 0)
-       as = player->cnum;
-    else {
-       if ((n = natarg(player->argp[1], "Which country? ")) < 0) {
-           pr("Bad country number\n");
+    if (player->argp[1] == 0) {
+       natp = getnatp(player->cnum);
+    } else {
+       if (!(natp = natargp(player->argp[1], NULL)))
            return RET_SYN;
-       }
-       as = (natid)n;
-    }
-    if ((natp = getnatp(as)) == 0) {
-       pr("Bad country number %d\n", player->cnum);
-       return RET_SYN;
     }
+    as = natp->nat_cnum;
     pr("\t%s Acceptance Status Report\t", cname(as));
     prdate();
     pr("\n  Acceptance status          %5s                theirs\n",
        player->cnum == as ? "yours" : " his");
     pr("                       tel trty anno loan   tel trty anno loan\n");
-    for (cn = 1; cn < MAXNOC; cn++) {
-       if ((np = getnatp(cn)) == 0)
-           break;
+    for (cn = 0; cn < MAXNOC; cn++) {
        if (cn == as)
            continue;
-       if ((np->nat_stat & STAT_NORM) == 0 &&
-           (np->nat_stat & STAT_SANCT) == 0)
+       if ((np = getnatp(cn)) == 0)
+           break;
+       if (np->nat_stat == STAT_UNUSED)
            continue;
-       if (opt_HIDDEN) {
-           if (!player->god && !getcontact(getnatp(player->cnum), cn))
-               continue;
-       }
        pr("%3d) %-14.14s  ", cn, cname(cn));
        pr("%-9s %s\n", rejectname(natp, cn), rejectname(np, as));
     }