/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2015, 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/>.
*
* ---
*
* ---
*
* sona.c: Sonar from a sub (or other sonar-equipped ship)
- *
+ *
* Known contributors to this file:
* Jim Griffith, 1989
* Ken Stevens, 1995
+ * Markus Armbruster, 2004-2012
*/
#include <config.h>
+#include "chance.h"
#include "commands.h"
#include "map.h"
#include "optlist.h"
struct mchrstr *tmcp;
struct nstr_sect ns;
int range;
- int pingrange;
+ int visib, pingrange;
int srange;
int vrange;
int dist;
static signed char **vis = NULL;
static signed char *visbuf = NULL;
- if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
+ if (!snxtitem(&ni, EF_SHIP, player->argp[1], NULL))
return RET_SYN;
if (!radbuf)
- radbuf = malloc((WORLD_Y * (WORLD_X + 1)));
+ radbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!visbuf)
- visbuf = malloc((WORLD_Y * (WORLD_X + 1)));
+ visbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!rad && radbuf) {
rad = malloc(WORLD_Y * sizeof(char *));
if (rad) {
}
}
snxtsct_dist(&ns, ship.shp_x, ship.shp_y, srange);
- cx = deltax(ship.shp_x, ns.range.lx);
- cy = deltay(ship.shp_y, ns.range.ly);
+ cx = deltx(&ns.range, ship.shp_x);
+ cy = delty(&ns.range, ship.shp_y);
while (nxtsct(&ns, §)) {
if (!line_of_sight(rad, cx, cy, ns.dx, ns.dy)) {
rad[ns.dy][ns.dx] = ' ';
if (targ.shp_own == player->cnum || targ.shp_own == 0)
continue;
tmcp = &mchr[(int)targ.shp_type];
- pingrange = MIN(7, MAX(targ.shp_visib, 10) * range / 10);
+ visib = shp_visib(&targ);
+ pingrange = MIN(7, MAX(visib, 10) * range / 10);
vrange = pingrange * ship.shp_effic / 200;
dist = mapdist(targ.shp_x, targ.shp_y, ship.shp_x, ship.shp_y);
pingrange = (MAX(pingrange, 2) * targ.shp_effic) / 100;
if (rad[y][x] != dchr[SCT_WATER].d_mnem && rad[y][x] != 'X')
continue;
if (tmcp->m_flags & M_SUB &&
- getrel(getnatp(targ.shp_own), player->cnum) < FRIENDLY) {
- if (mcp->m_vrnge + targ.shp_visib < 8)
+ relations_with(targ.shp_own, player->cnum) < FRIENDLY) {
+ if (mcp->m_vrnge + visib < 8)
pr("Sonar detects sub #%d @ %s\n",
targ.shp_uid,
xyas(targ.shp_x, targ.shp_y, player->cnum));
- else if (mcp->m_vrnge + targ.shp_visib < 10)
+ else if (mcp->m_vrnge + visib < 10)
pr("Sonar detects %s @ %s\n",
prship(&targ),
xyas(targ.shp_x, targ.shp_y, player->cnum));
cname(targ.shp_own), prship(&targ),
xyas(targ.shp_x, targ.shp_y, player->cnum));
- if (targ.shp_visib > vis[y][x]) {
- vis[y][x] = targ.shp_visib;
+ if (visib > vis[y][x]) {
+ vis[y][x] = visib;
/* &~0x20 makes it a cap letter */
rad[y][x] = (*mchr[(int)targ.shp_type].m_name) & ~0x20;
}
struct plist *ip;
struct sctstr sect;
int found = 0;
- int range, i;
+ int range, i, vis;
int pingrange;
int vrange;
int dist;
tmcp = &mchr[(int)targ->shp_type];
if (!(tmcp->m_flags & M_SUB))
continue;
- if (roll(100) > pln_identchance(pp, shp_hardtarget(targ),
- EF_SHIP))
+ if (!pct_chance(pln_identchance(pp, shp_hardtarget(targ),
+ EF_SHIP)))
continue;
- pingrange = MAX(targ->shp_visib, 10) * range / 10;
+ vis = shp_visib(targ);
+ pingrange = MAX(vis, 10) * range / 10;
vrange = pingrange * (pp->pln_effic / 200.0);
dist = mapdist(targ->shp_x, targ->shp_y, x, y);
pingrange = (MAX(pingrange, 2) * targ->shp_effic);
continue;
add_shiplist(targ->shp_uid, head);
if (!found) {
- mpr(pp->pln_own,
- "\nSonar contact in %s\n", xyas(x, y, pp->pln_own));
+ pr("Sonar contact in %s\n", xyas(x, y, player->cnum));
found = 1;
}
- if (getrel(getnatp(targ->shp_own), pp->pln_own) < FRIENDLY &&
- roll(100) > pln_identchance(pp, shp_hardtarget(targ),
- EF_SHIP))
- if (roll(100) > pln_identchance(pp, shp_hardtarget(targ),
- EF_SHIP))
- mpr(pp->pln_own, "sub #%d %s\n", targ->shp_uid,
- xyas(targ->shp_x, targ->shp_y, pp->pln_own));
+ if (relations_with(targ->shp_own, pp->pln_own) < FRIENDLY &&
+ !pct_chance(pln_identchance(pp, shp_hardtarget(targ),
+ EF_SHIP)))
+ if (!pct_chance(pln_identchance(pp, shp_hardtarget(targ),
+ EF_SHIP)))
+ pr("sub #%d %s\n", targ->shp_uid,
+ xyas(targ->shp_x, targ->shp_y, player->cnum));
else
- mpr(pp->pln_own, "%s %s\n",
- prship(targ),
- xyas(targ->shp_x, targ->shp_y, pp->pln_own));
+ pr("%s %s\n", prship(targ),
+ xyas(targ->shp_x, targ->shp_y, player->cnum));
else
- mpr(pp->pln_own, "%s %s @ %s\n",
- cname(targ->shp_own), prship(targ),
- xyas(targ->shp_x, targ->shp_y, pp->pln_own));
+ pr("%s %s @ %s\n", cname(targ->shp_own), prship(targ),
+ xyas(targ->shp_x, targ->shp_y, player->cnum));
}
}
+ if (found)
+ pr("\n");
}
-/*
+/*
* line_of_sight() - is there a "straight" all water path from (x,y) to (tx,ty)
* Ken & Irina Stevens, 1995
*/
projects / empserver / blobdiff