/*
* 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-2016, 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.
*
* ---
*
* rout.c: Show empire deliver routes
- *
+ *
* Known contributors to this file:
- *
+ *
*/
#include <config.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nat.h"
-#include "nsc.h"
-#include "sect.h"
+#include "commands.h"
#include "item.h"
-#include "path.h"
-#include "file.h"
#include "map.h"
-#include "commands.h"
#include "optlist.h"
+#include "path.h"
int
rout(void)
int ry;
i_type i_del;
int dir;
- s_char *p;
- s_char what[64];
- s_char *str;
- s_char buf1[1024];
+ char *p;
/* 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 s_char *buf = (s_char *)0;
+ static char *mapbuf = NULL;
+ static char **map = NULL;
int i;
- if ((ip = whatitem(player->argp[1], "What item? ")) == 0)
+ if (!(ip = whatitem(player->argp[1], "What item? ")))
+ return RET_SYN;
+ i_del = ip->i_uid;;
+ if (!snxtsct(&ns, player->argp[2]))
return RET_SYN;
- i_del = ip->i_vtype;;
- if (player->argp[2] == (s_char *)0) {
- if ((str = getstring("(sects)? ", buf1)) == 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(&ns, what))
- return RET_FAIL;
- } else if (!snxtsct(&ns, str))
- return RET_FAIL;
if (!mapbuf)
- mapbuf = malloc((WORLD_Y * MAPWIDTH(3)) * sizeof(s_char));
+ mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
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(3) * i];
} else if (map) {
free(map);
- map = (s_char **)0;
+ map = NULL;
}
}
- if (!buf)
- buf = malloc((MAPWIDTH(3) + 12) * sizeof(s_char));
- if (!mapbuf || !map || !buf) {
+ if (!mapbuf || !map) {
pr("Memory error, tell the deity.\n");
logerror("malloc failed in rout\n");
return RET_FAIL;
natp = getnatp(player->cnum);
xyrelrange(natp, &ns.range, &relrange);
- memset(mapbuf, 0, ((WORLD_Y * MAPWIDTH(3))));
- blankfill((s_char *)mapbuf, &ns.range, 3);
+ blankfill(mapbuf, &ns.range, 3);
border(&relrange, " ", " ");
while (nxtsct(&ns, §)) {
if (!player->owner)
continue;
p = &map[ns.dy][ns.dx * 2];
- if ((dir = sect.sct_del[i_del] & 0x7) &&
- nstr_exec(cond, ncond, §))
- memcpy(p, routech[dir][0], 3);
+ dir = sect.sct_del[i_del] & 0x7;
+ if (dir && nstr_exec(cond, ncond, §))
+ memcpy(p, routech[dir], 3);
p[1] = dchr[sect.sct_type].d_mnem;
}
for (row = 0, y = ns.range.ly; row < ns.range.height; y++, row++) {
ry = yrel(natp, y);
- memset(buf, 0, (MAPWIDTH(3) + 10));
- sprintf(buf, "%4d ", ry);
- memcpy(buf + 5, map[row], ns.range.width * 2 + 1);
- sprintf(buf + 5 + ns.range.width * 2 + 1, " %-4d\n", ry);
- pr("%s", buf);
+ pr("%4d %s %-4d\n", ry, map[row], ry);
if (y >= WORLD_Y)
y -= WORLD_Y;
}