From a8e2df3ad89fa7fdc0f2e0b96899d9e60d92004b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 22 May 2006 18:51:24 +0000 Subject: [PATCH] (edit): Crashed when country argument didn't name a country. Fix & simplify. Reported by Pat Loney. --- src/lib/commands/edit.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c index 10bb62e7..f4cbc138 100644 --- a/src/lib/commands/edit.c +++ b/src/lib/commands/edit.c @@ -108,12 +108,9 @@ edit(void) return RET_FAIL; break; case 'c': - if (!(ptr = getstarg(player->argp[2], "Country number? ", buf))) + np = natargp(player->argp[2], "Country? "); + if (!np) return RET_SYN; - if (isdigit(*ptr)) - np = getnatp(atoi(ptr)); - else - np = natargp(ptr, NULL); break; case 'p': if ((num = onearg(player->argp[2], "Plane number? ")) < 0)