/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, 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.
*
* ---
*
* Dave Pare, 1986
*/
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "map.h"
+#include <config.h>
+
#include "commands.h"
+#include "map.h"
#include "optlist.h"
int
struct natstr *np;
int ncond;
int nsect;
- s_char *ptr;
+ char *ptr;
coord y, yval;
int i;
- s_char what[64];
- s_char *str;
- s_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 (player->argp[1] == (s_char *)0) {
- if ((str = getstring("(sects)? ", buf)) == 0)
- return RET_SYN;
- } else {
- str = player->argp[1];
- }
-
- if (*str == '*') {
- sprintf(what, "%d:%d,%d:%d",
- -WORLD_X / 2, WORLD_X / 2 - 1,
- -WORLD_Y / 2, WORLD_Y / 2 - 1);
- if (!snxtsct(&ns, what))
- return RET_FAIL;
- } else if (!snxtsct(&ns, str))
+ if (!snxtsct(&ns, player->argp[1]))
return RET_SYN;
if (!mapbuf)
- mapbuf =
- (s_char *)malloc((WORLD_Y * MAPWIDTH(1)) * sizeof(s_char));
+ mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!map) {
- map = (s_char **)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((s_char *)map);
- map = (s_char **)0;
+ free(map);
+ map = NULL;
}
}
if (!mapbuf || !map) {
ns.ncond = 0;
xyrelrange(getnatp(player->cnum), &ns.range, &range);
border(&range, " ", "");
- blankfill((s_char *)mapbuf, &ns.range, 1);
+ blankfill(mapbuf, &ns.range, 1);
while (nxtsct(&ns, §)) {
if (!player->owner)
continue;