diff --git a/src/lib/commands/path.c b/src/lib/commands/path.c index 8ecea9d8..2aeda497 100644 --- a/src/lib/commands/path.c +++ b/src/lib/commands/path.c @@ -102,7 +102,7 @@ path(void) snxtsct_area(&ns, &absrange); natp = getnatp(player->cnum); xyrelrange(natp, &absrange, &relrange); - blankfill((s_char *)mapbuf, &ns.range, 3); + blankfill(mapbuf, &ns.range, 3); for (; *pp; ++pp) { i = diridx(*pp); if (i == DIR_STOP) diff --git a/src/lib/commands/rout.c b/src/lib/commands/rout.c index 86029ae6..f4a6a036 100644 --- a/src/lib/commands/rout.c +++ b/src/lib/commands/rout.c @@ -101,7 +101,7 @@ rout(void) 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, §)) { diff --git a/src/lib/commands/sect.c b/src/lib/commands/sect.c index af9607a0..79182c80 100644 --- a/src/lib/commands/sect.c +++ b/src/lib/commands/sect.c @@ -89,7 +89,7 @@ sct(void) 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; diff --git a/src/lib/commands/surv.c b/src/lib/commands/surv.c index 3e6b6c8d..c4d7d618 100644 --- a/src/lib/commands/surv.c +++ b/src/lib/commands/surv.c @@ -109,7 +109,7 @@ surv(void) 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; diff --git a/src/lib/commands/wing.c b/src/lib/commands/wing.c index 5448b816..593335ac 100644 --- a/src/lib/commands/wing.c +++ b/src/lib/commands/wing.c @@ -64,7 +64,7 @@ wing(void) if (!snxtitem(&nstr, EF_PLANE, player->argp[2])) return RET_SYN; count = 0; - while (nxtitem(&nstr, (s_char *)&plane)) { + while (nxtitem(&nstr, &plane)) { if (plane.pln_own != player->cnum) continue; if (plane.pln_wing == c) diff --git a/src/lib/common/maps.c b/src/lib/common/maps.c index 4dd5a635..7c43be56 100644 --- a/src/lib/common/maps.c +++ b/src/lib/common/maps.c @@ -104,7 +104,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp) nsp->ncond = 0; xyrelrange(np, &nsp->range, &range); border(&range, " ", ""); - blankfill((s_char *)wmapbuf, &nsp->range, 1); + blankfill(wmapbuf, &nsp->range, 1); if (bmap) { int c; switch (bmap) { diff --git a/src/lib/subs/radmap.c b/src/lib/subs/radmap.c index d22fba40..0b78b3cb 100644 --- a/src/lib/subs/radmap.c +++ b/src/lib/subs/radmap.c @@ -119,7 +119,7 @@ radmap2(int owner, pr("%s efficiency %d%%, max range %d\n", xyas(cx, cy, owner), eff, range); snxtsct_dist(&ns, cx, cy, range); - blankfill((s_char *)radbuf, &ns.range, 1); + blankfill(radbuf, &ns.range, 1); while (nxtsct(&ns, §)) { if (sect.sct_own == owner || sect.sct_type == SCT_WATER diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c index 14495b83..e39cb528 100644 --- a/src/lib/subs/satmap.c +++ b/src/lib/subs/satmap.c @@ -105,7 +105,7 @@ satmap(int x, int y, int eff, int range, int flags, int type) else snxtsct_dist(&ns, x, y, range); - blankfill((s_char *)radbuf, &ns.range, 1); + blankfill(radbuf, &ns.range, 1); if (flags & P_S) { pr("Satellite sector report\n"); prdate();