/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, 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/>.
*
* ---
*
- * 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.
*
* ---
*
* skyw.c: Look at satellites in the sky.
- *
+ *
* Known contributors to this file:
* Ken Stevens, 1995
+ * Markus Armbruster, 2010
*/
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "plane.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include <config.h>
+
#include "commands.h"
#include "optlist.h"
+#include "plane.h"
-#define TSIZE 200
+#define TSIZE 200
struct sky {
struct sky *s_next;
struct nstr_sect nstr;
struct sky *skyp;
struct sky *list[TSIZE];
- int i, k, j, n;
+ int i, n;
int vrange, see;
- int x, y;
- int mink, minj, maxk, maxj;
+ int x, y, dx, dy, dxmax;
int nsat = 0;
- float tech;
+ double tech;
struct nstr_item ni;
- if (snxtsct(&nstr, player->argp[1]) == 0)
+ if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN;
for (i = 0; i < TSIZE; i++)
- list[i] = 0;
- skyp = (struct sky *)malloc(sizeof(*skyp));
+ list[i] = NULL;
+ skyp = malloc(sizeof(*skyp));
snxtitem_all(&ni, EF_PLANE);
- while (nxtitem(&ni, (s_char *)&skyp->s_sat)) {
+ while (nxtitem(&ni, &skyp->s_sat)) {
if (!skyp->s_sat.pln_own)
continue;
- if (!(skyp->s_sat.pln_flags & PLN_LAUNCHED))
+ if (!pln_is_in_orbit(&skyp->s_sat))
continue;
getsect(skyp->s_sat.pln_x, skyp->s_sat.pln_y, §);
n = scthash(skyp->s_sat.pln_x, skyp->s_sat.pln_y, TSIZE);
skyp->s_spotted = 0;
skyp->s_next = list[n];
list[n] = skyp;
- skyp = (struct sky *)malloc(sizeof(*skyp));
+ skyp = malloc(sizeof(*skyp));
nsat++;
}
/* get that last one! */
- free((s_char *)skyp);
+ free(skyp);
pr("- = [ Skywatch report for %s ] = -\n", cname(player->cnum));
- pr(" %18s%20s %s\n", "Country", "Satellite", "Location");
+ pr(" Country Satellite Location\n");
tech = tfact(player->cnum, 1.0);
while (nxtsct(&nstr, §) && nsat) {
if (sect.sct_own != player->cnum)
vrange = (int)(sect.sct_effic / 100.0 * see * tech);
if (vrange < 1)
vrange = 1;
- maxk = vrange;
- maxj = vrange * 2;
- vrange *= vrange;
- mink = -maxk;
- minj = -maxj;
- for (j = minj; j <= maxj && nsat; j++) {
- x = xnorm(sect.sct_x + j);
- for (k = mink; k <= maxk && nsat; k++) {
- if ((j + k) & 01)
- continue;
- /* quick range check to save time... */
- if (vrange < (j * j + 3 * k * k) / 4)
- continue;
- y = ynorm(sect.sct_y + k);
+ for (dy = -vrange; dy <= vrange; dy++) {
+ y = ynorm(sect.sct_y + dy);
+ dxmax = 2 * vrange - abs(dy);
+ for (dx = -dxmax; dx <= dxmax; dx += 2) {
+ x = xnorm(sect.sct_x + dx);
n = scthash(x, y, TSIZE);
- if (list[n] == 0)
+ if (!list[n])
continue;
nsat -= showsat(&list[n], x, y);
}
for (i = 0; i < TSIZE; i++) {
while (NULL != (skyp = list[i])) {
list[i] = skyp->s_next;
- free((s_char *)skyp);
+ free(skyp);
}
}
return RET_OK;
showsat(struct sky **skypp, int x, int y)
{
struct sky *skyp;
- struct sky *todelete = 0;
+ struct sky *todelete = NULL;
struct sky **prev;
- struct plchrstr *pcp;
- s_char *name;
int nsat = 0;
- prev = 0;
+ prev = NULL;
skyp = *skypp;
prev = skypp;
do {
/* we delete it, we free it. */
if (todelete) {
- free((s_char *)todelete);
- todelete = 0;
+ free(todelete);
+ todelete = NULL;
}
if (skyp->s_sat.pln_x != x || skyp->s_sat.pln_y != y) {
prev = &(*prev)->s_next;
continue;
}
- pcp = &plchr[(int)skyp->s_sat.pln_type];
- name = pcp->pl_name;
- pr(" %12.12s (#%d) %20s %s\n",
+ pr(" %12.12s (#%3d) %s @ %s\n",
cname(skyp->s_sat.pln_own), skyp->s_sat.pln_own,
- name, xyas(x, y, player->cnum));
+ prplane(&skyp->s_sat), xyas(x, y, player->cnum));
if (opt_HIDDEN) {
/* FOUND_COAST should probably be changed to FOUND_SKY -KHS */
setcont(player->cnum, skyp->s_sat.pln_own, FOUND_COAST);
} while (NULL != (skyp = skyp->s_next));
/* check that last one! */
if (todelete)
- free((s_char *)todelete);
- return (nsat);
+ free(todelete);
+ return nsat;
}
projects / empserver / blobdiff