empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(set_target): Improve rejection message.

Browse source
This commit is contained in:
Markus Armbruster 2006-01-06 14:20:03 +00:00
parent 8d578153c7
commit 57808ef10c
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/commands/powe.c
View file

@ -63,7 +63,7 @@ static void addtopow(short *vec, struct powstr *pow);
static void gen_power(void); static void gen_power(void);
static void out5(double value, int round_val, int round_flag); static void out5(double value, int round_val, int round_flag);
static int powcmp(const void *, const void *); static int powcmp(const void *, const void *);
static int set_target(s_char *, int *); static int set_target(char *, int *);
int int
powe(void) powe(void)
@ -378,7 +378,7 @@ addtopow(short *vec, struct powstr *pow)
} }
static int static int
set_target(s_char *p, int *targets) set_target(char *p, int *targets)
{ {
int target; int target;
struct natstr *natp; struct natstr *natp;
@ -391,13 +391,9 @@ set_target(s_char *p, int *targets)
else else
target = cnumb(p); target = cnumb(p);
if (target > 0 && target < MAXNOC && (natp = getnatp(target))) { if (target >= 0 && target < MAXNOC && (natp = getnatp(target))) {
if (natp->nat_stat == STAT_GOD) { if (natp->nat_stat != STAT_ACTIVE) {
pr("Country #%d is a deity country\n", target); pr("Country '%s' is not a normal country\n", p);
} else if (natp->nat_stat == STAT_UNUSED) {
pr("Country #%d is not in use\n", target);
} else if (natp->nat_stat != STAT_ACTIVE) {
pr("Country #%d is not a normal country\n", target);
} else { } else {
targets[target] = 1; targets[target] = 1;
return 1; return 1;