From d21d7a02307469cd77eb073bdcd41ca5760c6e70 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 6 Jan 2006 18:07:30 +0000 Subject: [PATCH] (set_target): Simplify using natarg(). --- src/lib/commands/powe.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c index ff195d0f..4a28b242 100644 --- a/src/lib/commands/powe.c +++ b/src/lib/commands/powe.c @@ -385,21 +385,15 @@ set_target(char *p, int *targets) if (!p) return 0; + target = natarg(p, NULL); + if (target < 0) + return 0; + natp = getnatp(target); + if (natp->nat_stat != STAT_ACTIVE) { + pr("Country '%s' is not a normal country\n", p); + return 0; + } - if (isdigit(*p)) - target = atoi(p); - else - target = cnumb(p); - - if (target >= 0 && target < MAXNOC && (natp = getnatp(target))) { - if (natp->nat_stat != STAT_ACTIVE) { - pr("Country '%s' is not a normal country\n", p); - } else { - targets[target] = 1; - return 1; - } - } else - pr("Bad country: \'%s\'\n", p); - - return 0; + targets[target] = 1; + return 1; }