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

(acce): Use natargp() rather than natarg(), because acce() should not

Browse source 
require contact.

(acce): Used to show only contacted active and deity countries, except
for #0.  Change to show all countries, to match current version of
reject.
This commit is contained in:
Markus Armbruster 2006-01-06 21:08:18 +00:00
parent c3d5ed801c
commit ad05ff70a1
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,30 +55,25 @@ acce(void)
natid as; natid as;
int n; int n;
if (player->argp[1] == 0) if (player->argp[1] == 0) {
as = player->cnum; natp = getnatp(player->cnum);
else { } else {
if ((n = natarg(player->argp[1], "Which country? ")) < 0) if (!(natp = natargp(player->argp[1], "Which country? ")))
return RET_SYN; return RET_SYN;
as = (natid)n;
} }
natp = getnatp(as); as = natp->nat_cnum;
pr("\t%s Acceptance Status Report\t", cname(as)); pr("\t%s Acceptance Status Report\t", cname(as));
prdate(); prdate();
pr("\n Acceptance status %5s theirs\n", pr("\n Acceptance status %5s theirs\n",
player->cnum == as ? "yours" : " his"); player->cnum == as ? "yours" : " his");
pr(" tel trty anno loan tel trty anno loan\n"); pr(" tel trty anno loan tel trty anno loan\n");
for (cn = 1; cn < MAXNOC; cn++) { for (cn = 0; cn < MAXNOC; cn++) {
if ((np = getnatp(cn)) == 0)
break;
if (cn == as) if (cn == as)
continue; continue;
if (np->nat_stat < STAT_SANCT) if ((np = getnatp(cn)) == 0)
break;
if (np->nat_stat == STAT_UNUSED)
continue; continue;
if (opt_HIDDEN) {
if (!player->god && !getcontact(getnatp(player->cnum), cn))
continue;
}
pr("%3d) %-14.14s ", cn, cname(cn)); pr("%3d) %-14.14s ", cn, cname(cn));
pr("%-9s %s\n", rejectname(natp, cn), rejectname(np, as)); pr("%-9s %s\n", rejectname(natp, cn), rejectname(np, as));
} }