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 4293faa9ebf9f4626273a1622826f573d475d167..099fd4e18ce81b8d07c5be1950a91c0f80c5e147 100644 (file)
--- a/src/lib/subs/natarg.c
+++ b/src/lib/subs/natarg.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.
  *
  *  ---
  *
@@ -45,15 +45,13 @@
 /*
  * 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.
+ * 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.
  */
-int
-natarg(char *arg, char *prompt)
+struct natstr *
+natargp(char *arg, char *prompt)
 {
     char buf[1024];
     int n;
@@ -61,28 +59,47 @@ natarg(char *arg, char *prompt)
 
     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 (n == M_NOTUNIQUE) {
            pr("Country '%s' is ambiguous\n", arg);
-           return -1;
+           return NULL;
        }
     }
     np = getnatp(n);
-    if (!np) {
+    if (!np || np->nat_stat == STAT_UNUSED) {
        pr("Country '%s' doesn't exist.\n", arg);
-       return -1;
+       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 (!player->god && !getcontact(getnatp(player->cnum), np->nat_cnum)) {
            if (np->nat_stat != STAT_GOD) {
                pr("Country '%s' has not been contacted.\n", arg);
                return -1;
            }
        }
     }
-    return n;
+    return np->nat_cnum;
 }