(set_target): Simplify using natarg().

This commit is contained in:
Markus Armbruster 2006-01-06 18:07:30 +00:00
parent c791849595
commit d21d7a0230

View file

@ -385,21 +385,15 @@ set_target(char *p, int *targets)
if (!p) if (!p)
return 0; return 0;
target = natarg(p, NULL);
if (isdigit(*p)) if (target < 0)
target = atoi(p); return 0;
else natp = getnatp(target);
target = cnumb(p);
if (target >= 0 && target < MAXNOC && (natp = getnatp(target))) {
if (natp->nat_stat != STAT_ACTIVE) { if (natp->nat_stat != STAT_ACTIVE) {
pr("Country '%s' is not a normal country\n", p); pr("Country '%s' is not a normal country\n", p);
} else { return 0;
}
targets[target] = 1; targets[target] = 1;
return 1; return 1;
} }
} else
pr("Bad country: \'%s\'\n", p);
return 0;
}