/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
int
decl(void)
{
- struct natstr nat, *natp;
- int rel;
+ struct natstr nat;
+ enum relations rel;
int who;
struct nstr_item ni;
char *p;
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 && !getcontact(natp, ni.cur)) {
+ if (!player->god && !in_contact(who, ni.cur)) {
pr("You haven't contacted country #%d yet\n", ni.cur);
continue;
}