COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / subs / natarg.c

diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c
index c2cca5ac80c7d9e4992ed9a3323b95b6419ed8f9..099fd4e18ce81b8d07c5be1950a91c0f80c5e147 100644 (file)
--- a/src/lib/subs/natarg.c
+++ b/src/lib/subs/natarg.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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,16 +19,16 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  natarg.c: Return countr # given country name or country #
  * 
  *  Known contributors to this file:
- *     (List known contributors to this file)
+ *     Markus Armbruster, 2006
  */
 
 #include <config.h>
@@ -38,46 +38,68 @@
 #include "nat.h"
 #include "player.h"
 #include "file.h"
+#include "match.h"
 #include "prototypes.h"
 #include "optlist.h"
 
-int
-natarg(s_char *arg, s_char *prompt)
+/*
+ * Get nation argument.
+ * If ARG is not empty, use it, else prompt for input using PROMPT.
+ * If no input is provided, return NULL.
+ * If the argument identifies a country, return its getnatp() value.
+ * Else complain and return NULL.
+ * Caution: this function doesn't care for lack of contact.
+ */
+struct natstr *
+natargp(char *arg, char *prompt)
 {
-    s_char buf[1024];
+    char buf[1024];
     int n;
     struct natstr *np;
-    int byname = 0;
 
     arg = getstarg(arg, prompt, buf);
     if (arg == 0 || *arg == 0)
-       return -1;
+       return NULL;
     if (isdigit(*arg))
        n = atoi(arg);
     else {
        n = cnumb(arg);
-       if (opt_HIDDEN) {
-           byname = 1;
+       if (n == M_NOTUNIQUE) {
+           pr("Country '%s' is ambiguous\n", arg);
+           return NULL;
        }
     }
-    if (n < 0 || n >= MAXNOC) {
-       pr("No such country exists.\n");
-       n = -1;
+    np = getnatp(n);
+    if (!np || np->nat_stat == STAT_UNUSED) {
+       pr("Country '%s' doesn't exist.\n", arg);
+       return NULL;
     }
+    return np;
+}
+
+/*
+ * Get nation argument.
+ * If ARG is not empty, use it, else prompt for input using PROMPT.
+ * If no input is provided, return -1.
+ * If the argument identifies a country, return its number.  getnatp()
+ * can be assumed to succeed for this number.
+ * Else complain and return -1.
+ * If HIDDEN is enabled, countries not contacted are not eligible
+ * unless the player is a deity.
+ */
+int
+natarg(char *arg, char *prompt)
+{
+    struct natstr *np = natargp(arg, prompt);
+    if (!np)
+       return -1;
     if (opt_HIDDEN) {
-       if (!player->god && !getcontact(getnatp(player->cnum), n)) {
-           if ((np = getnatp(n)) == 0)
-               return -1;
+       if (!player->god && !getcontact(getnatp(player->cnum), np->nat_cnum)) {
            if (np->nat_stat != STAT_GOD) {
-               if (byname) {
-                   pr("No such country exists.\n");
-                   n = -1;
-               } else {
-                   pr("Country has not been contacted.\n");
-                   n = -2;
-               }
+               pr("Country '%s' has not been contacted.\n", arg);
+               return -1;
            }
        }
     }
-    return n;
+    return np->nat_cnum;
 }