Fix origin and zdone for invalid country argument

Invalid country argument was interpreted as (natid)-1, which is
normally 255.  Harmless as long as this is less than MAXNOC (99).
Wrong anyway.

diff --git a/src/lib/commands/orig.c b/src/lib/commands/orig.c
index d8c91f760e9ef2360f24915ad743b2eaeb05c9a5..120bb823ebd5b418915ceeb0215cd00c935feabc 100644 (file)
--- a/src/lib/commands/orig.c
+++ b/src/lib/commands/orig.c
@@ -43,7 +43,7 @@ orig(void)
     char *p;
     coord x, y;
     char buf[1024];
-    natid cnum;
+    int cnum;
     struct natstr *np;
 
     p = getstarg(player->argp[1], "New origin (sector or country) : ", buf);

diff --git a/src/lib/commands/zdon.c b/src/lib/commands/zdon.c
index 577a2887617ea2c4b91c97ec738f32272363de52..c439f8d8e2c48d697e00618c5defc1c5bed9cfcf 100644 (file)
--- a/src/lib/commands/zdon.c
+++ b/src/lib/commands/zdon.c
@@ -59,7 +59,7 @@
 int
 zdon(void)
 {
-    natid whichcnum;
+    int whichcnum;
     struct natstr *natp;
     char *p;