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

contact: Change in_contact()'s first parameter to natid

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-29 09:06:12 +02:00
parent c8e7548f24
commit d35303d426
9 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/lib/commands/decl.c
View file

@ -38,7 +38,7 @@
int
decl(void)
{
struct natstr nat, *natp;
struct natstr nat;
int rel;
int who;
struct nstr_item ni;
@ -80,14 +80,13 @@ decl(void)
return RET_SYN;
}
natp = getnatp(who);
while (nxtitem(&ni, &nat)) {
if (nat.nat_stat == STAT_UNUSED)
continue;
if (who == (natid)ni.cur)
continue;
if (opt_HIDDEN) {
if (!player->god && !in_contact(natp, ni.cur)) {
if (!player->god && !in_contact(who, ni.cur)) {
pr("You haven't contacted country #%d yet\n", ni.cur);
continue;
}