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 675f07aa20cc2c0402b8005143070df112ba31c9..3106c6397d437069c3d910a4a2821bbd49e9256a 100644 (file)
--- a/src/lib/commands/rela.c
+++ b/src/lib/commands/rela.c
@@ -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.
  *
  *  ---
  *
@@ -58,25 +58,15 @@ rela(void)
     if (player->argp[1] == 0)
        as = player->cnum;
     else {
-       if ((n = natarg(player->argp[1], "Which country? ")) < 0) {
-           pr("Bad country number\n");
+       if ((n = natarg(player->argp[1], NULL)) < 0)
            return RET_SYN;
-       }
        as = (natid)n;
     }
-    if ((natp = getnatp(as)) == 0) {
-       pr("Bad country number %d\n", player->cnum);
-       return RET_SYN;
-    }
+    natp = getnatp(as);
     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");
-    }
+    pr("\n  Formal Relations         %5s      theirs\n",
+       player->cnum == as ? "yours" : "his");
     for (cn = 1; cn < MAXNOC; cn++) {
        if ((np = getnatp(cn)) == 0)
            break;
@@ -91,11 +81,7 @@ rela(void)
                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));
-       }
+       pr("%-10s %s\n", relatename(natp, cn), relatename(np, as));
     }
     return RET_OK;
 }