/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
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;
}
}
- if (getrel(natp, (natid)ni.cur) == rel)
+ if (relations_with(who, (natid)ni.cur) == rel)
continue;
setrel(who, (natid)ni.cur, rel);
}