*
* ---
*
- * 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.
*
* ---
*
#include "nat.h"
#include "player.h"
#include "file.h"
+#include "match.h"
#include "prototypes.h"
#include "optlist.h"
-int
-natarg(char *arg, 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)
{
char buf[1024];
int n;
arg = getstarg(arg, prompt, buf);
if (arg == 0 || *arg == 0)
- return -1;
+ 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 -2;
+ return -1;
}
}
}
- return n;
+ return np->nat_cnum;
}