/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
* radmap.c: Do a radar map given an x,y location, effic, and other
- *
+ *
* Known contributors to this file:
* Dave Pare, 1989
*/
+#include <config.h>
+
+#include <stdlib.h>
+#include "file.h"
+#include "map.h"
#include "misc.h"
-#include "player.h"
-#include "xy.h"
#include "nat.h"
-#include "sect.h"
-#include "ship.h"
-#include "plane.h"
-#include "file.h"
#include "nsc.h"
-#include "prototypes.h"
#include "optlist.h"
+#include "plane.h"
+#include "player.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "ship.h"
+#include "xy.h"
static void radmap2(int, int, int, int, int, double, int);
}
/* More dynamic world sized buffers. We create 'em once, and then
- * never again. No need to keep creating/tearint apart. We may
+ * 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 s_char **rad;
-static s_char *radbuf;
-static s_char **vis;
-static s_char *visbuf;
+static char **rad;
+static char *radbuf;
+static signed char **vis;
+static signed char *visbuf;
static void
radmap2(int owner,
int cx, int cy, int eff, int range, double seesub, int pr_flag)
{
- int rng;
+ int visib, rng;
struct sctstr sect;
struct shpstr ship;
struct plnstr plane;
int changed = 0;
if (!radbuf)
- radbuf = (s_char *)malloc((WORLD_Y * (WORLD_X + 1)) *
- sizeof(s_char));
+ radbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!visbuf)
- visbuf = (s_char *)malloc((WORLD_Y * (WORLD_X + 1)) *
- sizeof(s_char));
+ visbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!rad) {
- rad = (s_char **)malloc(WORLD_Y * sizeof(s_char *));
+ rad = malloc(WORLD_Y * sizeof(char *));
if (rad && radbuf) {
for (x = 0; x < WORLD_Y; x++)
rad[x] = &radbuf[(WORLD_X + 1) * x];
}
}
if (!vis) {
- vis = (s_char **)malloc(WORLD_Y * sizeof(s_char *));
+ vis = malloc(WORLD_Y * sizeof(signed char *));
if (vis && visbuf) {
for (x = 0; x < WORLD_Y; x++)
vis[x] = &visbuf[(WORLD_X + 1) * x];
pr("%s efficiency %d%%, max range %d\n",
xyas(cx, cy, owner), eff, range);
snxtsct_dist(&ns, cx, cy, range);
- blankfill((s_char *)radbuf, &ns.range, 1);
+ blankfill(radbuf, &ns.range, 1);
while (nxtsct(&ns, §)) {
- if (sect.sct_own == owner ||
- (sect.sct_type <= SCT_RURAL && sect.sct_type != SCT_SANCT)
+ if (sect.sct_own == owner
+ || 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
if (!pr_flag)
return;
snxtitem_dist(&ni, EF_PLANE, cx, cy, range);
- while (nxtitem(&ni, (caddr_t)&plane)) {
+ while (nxtitem(&ni, &plane)) {
if (plane.pln_own == 0)
continue;
/* Used to have 'ghosts' when scanning whole world --ts */
x = deltx(&ns.range, (int)plane.pln_x);
y = delty(&ns.range, (int)plane.pln_y);
- if ((plane.pln_flags & PLN_LAUNCHED) && plane.pln_own != owner) {
- vis[y][x] = (s_char)100;
+ if (pln_is_in_orbit(&plane) && plane.pln_own != owner) {
+ vis[y][x] = 100;
rad[y][x] = '$';
}
}
snxtitem_dist(&ni, EF_SHIP, cx, cy, range);
- while (nxtitem(&ni, (caddr_t)&ship)) {
+ while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0)
continue;
/* Used to have 'ghosts' when scanning whole world --ts */
x = deltx(&ns.range, (int)ship.shp_x);
y = delty(&ns.range, (int)ship.shp_y);
- rng = (int)(range * ship.shp_visib / 20.0);
+ visib = shp_visib(&ship);
+ rng = (int)(range * visib / 20.0);
if (ni.curdist > rng)
continue;
if ((mchr[(int)ship.shp_type].m_flags & M_SUB) &&
ni.curdist > rng * seesub)
continue;
- if (ship.shp_visib > vis[y][x]) {
- vis[y][x] = ship.shp_visib;
+ if (visib > vis[y][x]) {
+ vis[y][x] = visib;
/* &~0x20 makes it a cap letter */
rad[y][x] = (*mchr[(int)ship.shp_type].m_name) & ~0x20;
}
}
- /*
+ /*
* make the center of the display 0
* so ve et al can find it.
*/
- rad[deltay(cy, ns.range.ly)][deltax(cx, ns.range.lx)] = '0';
- /* won't work for radar maps > WORLD_Y/2 */
-#ifdef HAY
- /* This is not correct for small, hitech worlds. */
- n = deltay(ns.range.hy, ns.range.ly);
-#else
- /* This is already available, so why not use it. */
+ rad[delty(&ns.range, cy)][deltx(&ns.range, cx)] = '0';
+
n = ns.range.height;
-#endif
for (row = 0; row < n; row++)
pr("%s\n", rad[row]);
pr("\n");
}
+/*
+ * Return distance from left edge of R to X.
+ * Value is between 0 (inclusive) and WORLD_X (exclusive).
+ * X must be normalized.
+ */
int
deltx(struct range *r, coord x)
{
- if (r->lx < r->hx)
- return x - r->lx;
-
if (x >= r->lx)
return x - r->lx;
-
return x + WORLD_X - r->lx;
}
+/*
+ * Return distance from top edge of R to Y.
+ * Value is between 0 (inclusive) and WORLD_Y (exclusive).
+ * Y must be normalized.
+ */
int
delty(struct range *r, coord y)
{
- if (r->ly < r->hy)
- return y - r->ly;
-
if (y >= r->ly)
return y - r->ly;
-
return y + WORLD_Y - r->ly;
}