From ba554cbb1f813f65fa89e6d9385410856cb414e3 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 6 Jan 2006 20:11:14 +0000
Subject: [PATCH] (natarg): Use new cnumb() values to improve diagnostics.

---
 src/lib/subs/natarg.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c
index 268d572e..4293faa9 100644
--- 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);