(natarg): Use new cnumb() values to improve diagnostics.

diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c
index 268d572ed6ac6f2fc18cae20807b8730d08a9dfe..4293faa9ebf9f4626273a1622826f573d475d167 100644 (file)
--- a/src/lib/subs/natarg.c
+++ b/src/lib/subs/natarg.c
@@ -38,6 +38,7 @@
 #include "nat.h"
 #include "player.h"
 #include "file.h"
+#include "match.h"
 #include "prototypes.h"
 #include "optlist.h"
 
@@ -63,8 +64,13 @@ natarg(char *arg, char *prompt)
        return -1;
     if (isdigit(*arg))
        n = atoi(arg);
-    else
+    else {
        n = cnumb(arg);
+       if (n == M_NOTUNIQUE) {
+           pr("Country '%s' is ambiguous\n", arg);
+           return -1;
+       }
+    }
     np = getnatp(n);
     if (!np) {
        pr("Country '%s' doesn't exist.\n", arg);