empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(nav_map): Remove unused bitmap and its initialization.

Browse source
This commit is contained in:
Markus Armbruster 2007-07-28 07:23:59 +00:00
parent cc2629d6cf
commit e24b608dc6
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/commands/navi.c
View file

@ -285,7 +285,6 @@ nav_map(int x, int y, int show_designations)
int i; int i;
/* Note this is not re-entrant anyway, so we keep the buffers /* Note this is not re-entrant anyway, so we keep the buffers
around */ around */
static unsigned char *bitmap = NULL;
static char *wmapbuf = NULL; static char *wmapbuf = NULL;
static char **wmap = NULL; static char **wmap = NULL;
int changed = 0; int changed = 0;
@ -302,14 +301,11 @@ nav_map(int x, int y, int show_designations)
wmap = NULL; wmap = NULL;
} }
} }
if (!bitmap) if (!wmapbuf || !wmap) {
bitmap = malloc((WORLD_X * WORLD_Y) / 8);
if (!wmapbuf || !wmap || !bitmap) {
pr("Memory error, tell the deity.\n"); pr("Memory error, tell the deity.\n");
logerror("malloc failed in navi\n"); logerror("malloc failed in navi\n");
return RET_FAIL; return RET_FAIL;
} }
memset(bitmap, 0, (WORLD_X * WORLD_Y) / 8);
snxtsct_dist(&ns, x, y, 1); snxtsct_dist(&ns, x, y, 1);
np = getnatp(player->cnum); np = getnatp(player->cnum);
xyrelrange(np, &ns.range, &range); xyrelrange(np, &ns.range, &range);