Update copyright notice

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

diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c
index 268d572ed6ac6f2fc18cae20807b8730d08a9dfe..5a427fabc700010c0b5ab83a5741cd39a55449e4 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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,64 +19,88 @@
  *
  *  ---
  *
- *  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:
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2009
  */
 
 #include <config.h>
 
 #include <ctype.h>
+#include <stdlib.h>
+#include "file.h"
+#include "match.h"
 #include "misc.h"
 #include "nat.h"
+#include "optlist.h"
 #include "player.h"
-#include "file.h"
 #include "prototypes.h"
-#include "optlist.h"
 
 /*
  * 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;
     struct natstr *np;
 
     arg = getstarg(arg, prompt, buf);
-    if (arg == 0 || *arg == 0)
-       return -1;
+    if (!arg || !*arg)
+       return NULL;
     if (isdigit(*arg))
        n = atoi(arg);
-    else
+    else {
        n = cnumb(arg);
+       if (n == M_NOTUNIQUE) {
+           pr("Country '%s' is ambiguous\n", arg);
+           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;
 }