X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Fnatarg.c;h=c2c7fbbd9ea0ffe5baa711ff9d168b5ca7d57b60;hp=13e27034e612b3da5094f8891660827af01cb6aa;hb=9b7adfbe;hpb=5f263a7753dc728809ff85c993af975f6c76e61e

diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c
index 13e27034e..c2c7fbbd9 100644
--- a/src/lib/subs/natarg.c
+++ b/src/lib/subs/natarg.c
@@ -42,40 +42,40 @@
 int
 natarg(s_char *arg, s_char *prompt)
 {
-	s_char	buf[1024];
-	int	n;
-        struct  natstr *np;
-        int     byname = 0;
+    s_char buf[1024];
+    int n;
+    struct natstr *np;
+    int byname = 0;
 
-	arg = getstarg(arg, prompt, buf);
-	if (arg == 0 || *arg == 0)
+    arg = getstarg(arg, prompt, buf);
+    if (arg == 0 || *arg == 0)
+	return -1;
+    if (isdigit(*arg))
+	n = atoi(arg);
+    else {
+	n = cnumb(arg);
+	if (opt_HIDDEN) {
+	    byname = 1;
+	}
+    }
+    if (n < 0 || n >= MAXNOC) {
+	pr("No such country exists.\n");
+	n = -1;
+    }
+    if (opt_HIDDEN) {
+	if (!player->god && !getcontact(getnatp(player->cnum), n)) {
+	    if ((np = getnatp(n)) == 0)
 		return -1;
-	if (isdigit(*arg))
-		n = atoi(arg);
-	else {
-		n = cnumb(arg);
-		if (opt_HIDDEN) {
-		    byname = 1;
+	    if ((np->nat_stat & STAT_GOD) == 0) {
+		if (byname) {
+		    pr("No such country exists.\n");
+		    n = -1;
+		} else {
+		    pr("Country has not been contacted.\n");
+		    n = -2;
 		}
-	}
-	if (n < 0 || n >= MAXNOC) {
-		pr("No such country exists.\n");
-		n = -1;
-	}
-	if (opt_HIDDEN) {
-	    if (!player->god && !getcontact(getnatp(player->cnum), n)) {
-                if ((np = getnatp(n)) == 0)
-                        return -1;
-                if ((np->nat_stat & STAT_GOD) == 0) {
-                        if (byname) {
-                                pr("No such country exists.\n");
-                                n = -1;
-                        } else {
-                                pr("Country has not been contacted.\n");
-                                n = -2;
-                        }
-                }
 	    }
 	}
-	return n;
+    }
+    return n;
 }