/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, 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/>.
*
* ---
*
- * 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.
*
* ---
*
* surv.c: Show sector survey
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
+ * Markus Armbruster, 2004-2014
*/
+#include <config.h>
+
#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
-#include "map.h"
#include "commands.h"
+#include "map.h"
#include "optlist.h"
static char code_char(struct valstr, struct sctstr *sp);
*
*/
int
-surv(void)
+c_survey(void)
{
int nsect;
struct nstr_sect nstr;
struct natstr *np;
struct sctstr sect;
struct range range;
- s_char *ptr;
+ char *ptr;
struct nscstr cond[NS_NCOND];
int ncond;
int i;
- s_char what[64];
- s_char buf[1024];
- s_char *str;
+ char buf[1024];
/* Note this is not re-entrant anyway, so we keep the buffers
around */
- static s_char *mapbuf = (s_char *)0;
- static s_char **map = (s_char **)0;
+ static char *mapbuf = NULL;
+ static char **map = NULL;
nsect = 0;
- if ((ptr = getstarg(player->argp[1], "commodity or variable? ", buf)) == 0)
+ ptr = getstarg(player->argp[1], "commodity or variable? ", buf);
+ if (!ptr || !*ptr)
return RET_SYN;
ptr = nstr_comp_val(ptr, &val, EF_SECTOR);
if (!ptr)
return RET_SYN;
- if (val.val_cat != NSC_OFF || nstr_coerce_val(&val, NSC_LONG, NULL) < 0) {
+ if (val.val_cat != NSC_OFF || nstr_promote(val.val_type) != NSC_LONG) {
pr("Can't survey this\n");
return RET_SYN;
}
for (; isspace(*ptr); ++ptr) ;
if (*ptr)
return RET_SYN;
- if (player->argp[2] == (s_char *)0) {
- if ((str = getstring("(sects)? ", buf)) == 0)
- return RET_SYN;
- } else {
- str = player->argp[2];
- }
- if (*str == '*') {
- sprintf(what, "%d:%d,%d:%d",
- -WORLD_X / 2, WORLD_X / 2 - 1,
- -WORLD_Y / 2, WORLD_Y / 2 - 1);
- if (!snxtsct(&nstr, what))
- return RET_FAIL;
- } else if (!snxtsct(&nstr, str))
+ if (!snxtsct(&nstr, player->argp[2]))
return RET_SYN;
if (!mapbuf)
- mapbuf = malloc((WORLD_Y * MAPWIDTH(1)) * sizeof(s_char));
+ mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!map) {
- map = malloc(WORLD_Y * sizeof(s_char *));
+ map = malloc(WORLD_Y * sizeof(char *));
if (map && mapbuf) {
for (i = 0; i < WORLD_Y; i++)
map[i] = &mapbuf[MAPWIDTH(1) * i];
} else if (map) {
free(map);
- map = (s_char **)0;
+ map = NULL;
}
}
if (!mapbuf || !map) {
np = getnatp(player->cnum);
xyrelrange(np, &nstr.range, &range);
border(&range, " ", "");
- blankfill((s_char *)mapbuf, &nstr.range, 1);
+ blankfill(mapbuf, &nstr.range, 1);
while (nxtsct(&nstr, §)) {
if (!player->owner)
continue;
int n;
int large = val.val_type != NSC_CHAR && val.val_type != NSC_UCHAR;
- nstr_exec_val(&val, player->cnum, sp, NSC_LONG);
+ nstr_eval(&val, player->cnum, sp, NSC_LONG);
+ if (CANT_HAPPEN(val.val_type != NSC_LONG))
+ return ' ';
amt = val.val_as.lng;
if (amt <= 0)
return ' ';