/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, 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
* ---
*
* rout.c: Show empire deliver routes
- *
+ *
* Known contributors to this file:
- *
+ *
*/
#include <config.h>
around */
static char *mapbuf = NULL;
static char **map = NULL;
- static char *buf = NULL;
int i;
if ((ip = whatitem(player->argp[1], "What item? ")) == 0)
map = NULL;
}
}
- if (!buf)
- buf = malloc(MAPWIDTH(3) + 12);
- 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(mapbuf, &ns.range, 3);
border(&relrange, " ", " ");
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);
+ 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;
}