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

(acce, rea, rela, snxtitem): Pass NULL as prompt when the prompt won't

Browse source 
be used.
This commit is contained in:
Markus Armbruster 2006-01-06 21:37:40 +00:00
parent 1b63d30a51
commit 604fe007c0
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/commands/acce.c
View file

@ -58,7 +58,7 @@ acce(void)
if (player->argp[1] == 0) { if (player->argp[1] == 0) {
natp = getnatp(player->cnum); natp = getnatp(player->cnum);
} else { } else {
if (!(natp = natargp(player->argp[1], "Which country? "))) if (!(natp = natargp(player->argp[1], NULL)))
return RET_SYN; return RET_SYN;
} }
as = natp->nat_cnum; as = natp->nat_cnum;

2
src/lib/commands/rea.c
View file

@ -100,7 +100,7 @@ rea(void)
if (player->god && player->argp[1] && if (player->god && player->argp[1] &&
(mineq(player->argp[1], "yes") == ME_MISMATCH) && (mineq(player->argp[1], "yes") == ME_MISMATCH) &&
(mineq(player->argp[1], "no") == ME_MISMATCH)) { (mineq(player->argp[1], "no") == ME_MISMATCH)) {
if ((n = natarg(player->argp[1], "")) < 0) if ((n = natarg(player->argp[1], NULL)) < 0)
return RET_SYN; return RET_SYN;
num = n; num = n;
may_delete = 0; may_delete = 0;

2
src/lib/commands/rela.c
View file

@ -58,7 +58,7 @@ rela(void)
if (player->argp[1] == 0) if (player->argp[1] == 0)
as = player->cnum; as = player->cnum;
else { else {
if ((n = natarg(player->argp[1], "Which country? ")) < 0) if ((n = natarg(player->argp[1], NULL)) < 0)
return RET_SYN; return RET_SYN;
as = (natid)n; as = (natid)n;
} }

2
src/lib/subs/snxtitem.c
View file

@ -72,7 +72,7 @@ snxtitem(struct nstr_item *np, int type, s_char *str)
return 0; return 0;
} }
if (type == EF_NATION && isalpha(*str)) { if (type == EF_NATION && isalpha(*str)) {
sprintf(natnumber, "%d", natarg(str, "")); sprintf(natnumber, "%d", natarg(str, NULL));
str = natnumber; str = natnumber;
} }
flags = ef_flags(type); flags = ef_flags(type);