/*
* 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-2021, 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/>.
*
* ---
*
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 1998-2000
- * Markus Armbruster, 2005-2008
+ * Markus Armbruster, 2005-2013
*/
#include <config.h>
+#include "chance.h"
#include "commands.h"
#include "item.h"
#include "land.h"
spy(void)
{
natid own;
- int relat;
+ enum relations relat;
coord x, y;
coord nx, ny;
int military;
btucost = (nsects / 40) + 1;
natp = getnatp(player->cnum);
if (natp->nat_btu < btucost) {
- pr("You don't have the BTU's for spying on that scale!\n");
+ pr("You don't have the BTUs for spying on that scale!\n");
return RET_FAIL;
}
- bitmap = calloc(WORLD_SZ() / 8, 1);
+ bitmap = calloc((WORLD_SZ() + 7) / 8, 1);
if (!bitmap) {
logerror("malloc failed in do_look\n");
pr("Memory error. Tell the deity.\n");
continue;
own = dsect.sct_own;
- relat = getrel(getnatp(own), player->cnum);
+ relat = relations_with(own, player->cnum);
if (relat <= NEUTRAL
&& chance(dsect.sct_item[I_MILIT] / 200.0)) {
/* spy caught */
pr("Spy deported from %s\n",
xyas(nx, ny, player->cnum));
if (own != 0)
- wu(0, own, "%s (#%d) spy deported from %s\n",
- cname(player->cnum), player->cnum,
- xyas(nx, ny, own));
+ wu(0, own, "%s spy deported from %s\n",
+ prnat(natp), xyas(nx, ny, own));
} else {
/* execute spy */
pr("BANG!! A spy was shot in %s\n",
xyas(nx, ny, player->cnum));
military--;
if (own != 0)
- wu(0, own, "%s (#%d) spy caught in %s\n",
- cname(player->cnum), player->cnum,
- xyas(nx, ny, own));
+ wu(0, own, "%s spy caught in %s\n",
+ prnat(natp), xyas(nx, ny, own));
nreport(player->cnum, N_SPY_SHOT, own, 1);
}
if (opt_HIDDEN)
static char *
player_relstr(natid them)
{
- int rel = getrel(getnatp(player->cnum), them);
+ enum relations rel = relations_with(player->cnum, them);
if (rel == ALLIED)
return "Allied";