COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/commands/rela.c b/src/lib/commands/rela.c
index 94223c9e5c379b9e8113da65edd3ae77c5fd6b70..3106c6397d437069c3d910a4a2821bbd49e9256a 100644 (file)
--- a/src/lib/commands/rela.c
+++ b/src/lib/commands/rela.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-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,11 +31,11 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nat.h"
-#include "sect.h"
 #include "file.h"
 #include "xy.h"
 #include "commands.h"
@@ -49,54 +49,39 @@
 int
 rela(void)
 {
-       struct  natstr *natp;
-       struct  natstr *np;
-       natid   cn;
-       natid   as;
-       int     n;
+    struct natstr *natp;
+    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");
-                       return RET_SYN;
-               }
-               as = (natid) n;
-       }
-       if ((natp = getnatp(as)) == 0) {
-               pr("Bad country number %d\n", player->cnum);
-               return RET_SYN;
-       }
-       pr("\t%s Diplomatic Relations Report\t", cname(as));
-       prdate();
-       if (opt_SLOW_WAR) {
-         pr("\n  Formal Relations         %5s      theirs\n",
-            player->cnum == as ? "yours" : "his");
-       } else {
-         pr("\n  Formal Relations         %5s     theirs\n",
-            player->cnum == as ? "yours" : "his");
-       }
-       for (cn=1; cn < MAXNOC; cn++) {
-               if ((np = getnatp(cn)) == 0)
-                       break;
-               if (cn == as)
-                       continue;
-               if ((np->nat_stat & STAT_NORM) == 0 &&
-                   (np->nat_stat & STAT_SANCT) == 0)
-                       continue;
-               if (opt_HIDDEN) {
-                   if (!player->god && !getcontact(natp, cn)) 
-                       continue;
-                   if (!player->god && !getcontact(getnatp(player->cnum), cn))
-                       continue;
-               }
-               pr("%3d) %-20.20s  ", cn, cname(cn));
-               if (opt_SLOW_WAR) {
-                 pr("%-10s %s\n", relatename(natp, cn), relatename(np, as));
-               } else {
-                 pr("%-9s %s\n", relatename(natp, cn), relatename(np, as));
-               }
+    if (player->argp[1] == 0)
+       as = player->cnum;
+    else {
+       if ((n = natarg(player->argp[1], NULL)) < 0)
+           return RET_SYN;
+       as = (natid)n;
+    }
+    natp = getnatp(as);
+    pr("\t%s Diplomatic Relations Report\t", cname(as));
+    prdate();
+    pr("\n  Formal Relations         %5s      theirs\n",
+       player->cnum == as ? "yours" : "his");
+    for (cn = 1; cn < MAXNOC; cn++) {
+       if ((np = getnatp(cn)) == 0)
+           break;
+       if (cn == as)
+           continue;
+       if (np->nat_stat < STAT_SANCT)
+           continue;
+       if (opt_HIDDEN) {
+           if (!player->god && !getcontact(natp, cn))
+               continue;
+           if (!player->god && !getcontact(getnatp(player->cnum), cn))
+               continue;
        }
-       return RET_OK;
+       pr("%3d) %-20.20s  ", cn, cname(cn));
+       pr("%-10s %s\n", relatename(natp, cn), relatename(np, as));
+    }
+    return RET_OK;
 }