/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2020, 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/>.
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* rela.c: Show relations with other countries
- *
+ *
* Known contributors to this file:
- *
+ *
*/
#include <config.h>
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
#include "commands.h"
#include "optlist.h"
int
rela(void)
{
- struct natstr *natp;
struct natstr *np;
natid cn;
natid as;
int n;
- if (player->argp[1] == 0)
+ if (!player->argp[1])
as = player->cnum;
else {
- if ((n = natarg(player->argp[1], "Which country? ")) < 0)
+ if ((n = natarg(player->argp[1], NULL)) < 0)
return RET_SYN;
as = (natid)n;
}
- natp = getnatp(as);
pr("\t%s Diplomatic Relations Report\t", cname(as));
prdate();
pr("\n Formal Relations %5s theirs\n",
player->cnum == as ? "yours" : "his");
for (cn = 1; cn < MAXNOC; cn++) {
- if ((np = getnatp(cn)) == 0)
+ if (!(np = getnatp(cn)))
break;
if (cn == as)
continue;
if (np->nat_stat < STAT_SANCT)
continue;
if (opt_HIDDEN) {
- if (!player->god && !getcontact(natp, cn))
+ if (!player->god && !in_contact(as, cn))
continue;
- if (!player->god && !getcontact(getnatp(player->cnum), cn))
+ if (!player->god && !in_contact(player->cnum, cn))
continue;
}
pr("%3d) %-20.20s ", cn, cname(cn));
- pr("%-10s %s\n", relatename(natp, cn), relatename(np, as));
+ pr("%-10s %s\n",
+ relations_string(relations_with(as, cn)),
+ relations_string(relations_with(cn, as)));
}
return RET_OK;
}