/*
* 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-2018, 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, 1989
+ * Markus Armbruster, 2004-2010
*/
#include <config.h>
#include <stdlib.h>
-#include "file.h"
#include "map.h"
#include "misc.h"
#include "nat.h"
#include "ship.h"
#include "xy.h"
+static int rad_range(int, double, int);
+static char rad_char(struct sctstr *, int, int, natid);
+
/* More dynamic world sized buffers. We create 'em once, and then
* never again. No need to keep creating/tearing apart. We may
* want to do this in other places too where it doesn't matter. */
static signed char *visbuf;
/*
- * Draw a radar map for radar at CX,CY.
- * EFF is the radar's efficiency, and RANGE its range at 100%
- * efficiency.
- * Submarines are detected at fraction SEESUB of the range.
+ * Draw a radar map for radar at @cx,@cy.
+ * @eff is the radar's efficiency, @tlev its tech level, @spy its power.
+ * Submarines are detected at fraction @seesub of the range.
*/
void
-radmap(int cx, int cy, int eff, int range, double seesub)
+radmap(int cx, int cy, int eff, double tlev, int spy, double seesub)
{
int visib, rng;
struct sctstr sect;
int x, y;
int row;
int n;
+ int range = rad_range(eff, tlev, spy);
int changed = 0;
if (!radbuf)
}
memset(visbuf, 0, (WORLD_Y * (WORLD_X + 1)));
- range = (int)(range * (eff / 100.0));
- if (range < 1)
- range = 1;
pr("%s efficiency %d%%, max range %d\n",
xyas(cx, cy, player->cnum), eff, range);
snxtsct_dist(&ns, cx, cy, range);
blankfill(radbuf, &ns.range, 1);
while (nxtsct(&ns, §)) {
- if (sect.sct_own == player->cnum
- || sect.sct_type == SCT_WATER
- || sect.sct_type == SCT_MOUNT
- || sect.sct_type == SCT_WASTE
- || ns.curdist <= range / 3)
- rad[ns.dy][ns.dx] = dchr[sect.sct_type].d_mnem;
- else
- rad[ns.dy][ns.dx] = '?';
+ rad[ns.dy][ns.dx] = rad_char(§, ns.curdist, range,
+ player->cnum);
changed += map_set(player->cnum, ns.x, ns.y, rad[ns.dy][ns.dx], 0);
}
if (changed)
}
/*
- * Return distance from left edge of R to X.
+ * Return distance from left edge of @r to @x.
* Value is between 0 (inclusive) and WORLD_X (exclusive).
- * X must be normalized.
+ * @x must be normalized.
*/
int
deltx(struct range *r, coord x)
}
/*
- * Return distance from top edge of R to Y.
+ * Return distance from top edge of @r to @y.
* Value is between 0 (inclusive) and WORLD_Y (exclusive).
- * Y must be normalized.
+ * @y must be normalized.
*/
int
delty(struct range *r, coord y)
}
/*
- * Update OWNER's bmap for radar at CX,CY.
- * EFF is the radar's efficiency, and RANGE its range at 100%
- * efficiency.
+ * Update @owner's bmap for radar at @cx,@cy.
+ * @eff is the radar's efficiency, @tlev its tech level, @spy its power.
*/
void
-rad_map_set(natid owner, int cx, int cy, int eff, int range)
+rad_map_set(natid owner, int cx, int cy, int eff, double tlev, int spy)
{
struct nstr_sect ns;
struct sctstr sect;
+ int range = rad_range(eff, tlev, spy);
int changed = 0;
char ch;
- range = (int)(range * (eff / 100.0));
- if (range < 1)
- range = 1;
snxtsct_dist(&ns, cx, cy, range);
while (nxtsct(&ns, §)) {
- if (sect.sct_own == owner
- || sect.sct_type == SCT_WATER
- || sect.sct_type == SCT_MOUNT
- || sect.sct_type == SCT_WASTE
- || ns.curdist <= range / 3)
- ch = dchr[sect.sct_type].d_mnem;
- else
- ch = '?';
+ ch = rad_char(§, ns.curdist, range, owner);
changed += map_set(owner, ns.x, ns.y, ch, 0);
}
if (changed)
writemap(owner);
}
+
+/*
+ * Range of a radar with @eff efficiency, @tlev tech, and @spy power.
+ */
+static int
+rad_range(int eff, double tlev, int spy)
+{
+ int range;
+
+ range = (int)techfact(tlev, spy);
+ range = (int)(range * (eff / 100.0));
+ if (range < 1)
+ range = 1;
+ return range;
+}
+
+/*
+ * Return character to use in radar maps for sector @sp.
+ * @dist is the distance from the radar, @range its range.
+ * Country @cn is using the radar.
+ */
+static char
+rad_char(struct sctstr *sp, int dist, int range, natid cn)
+{
+ if (sp->sct_own == cn
+ || sp->sct_type == SCT_WATER
+ || sp->sct_type == SCT_MOUNT
+ || sp->sct_type == SCT_WASTE
+ || dist <= range / 3)
+ return dchr[sp->sct_type].d_mnem;
+ return '?';
+}
projects / empserver / blobdiff