Recent s_char purge changed element types to s_char *, but missed
patterns malloc(N * sizeof(s_char *)), fix.
This commit is contained in:
parent
4cf7389ecd
commit
0a3a73cf3d
7 changed files with 7 additions and 7 deletions
|
@ -84,7 +84,7 @@ path(void)
|
||||||
if (!mapbuf)
|
if (!mapbuf)
|
||||||
mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
|
mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
|
||||||
if (!map) {
|
if (!map) {
|
||||||
map = malloc(WORLD_Y * sizeof(s_char *));
|
map = malloc(WORLD_Y * sizeof(char *));
|
||||||
if (map && mapbuf) {
|
if (map && mapbuf) {
|
||||||
for (i = 0; i < WORLD_Y; i++)
|
for (i = 0; i < WORLD_Y; i++)
|
||||||
map[i] = &mapbuf[MAPWIDTH(3) * i];
|
map[i] = &mapbuf[MAPWIDTH(3) * i];
|
||||||
|
|
|
@ -77,7 +77,7 @@ rout(void)
|
||||||
if (!mapbuf)
|
if (!mapbuf)
|
||||||
mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
|
mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
|
||||||
if (!map) {
|
if (!map) {
|
||||||
map = malloc(WORLD_Y * sizeof(s_char *));
|
map = malloc(WORLD_Y * sizeof(char *));
|
||||||
if (map && mapbuf) {
|
if (map && mapbuf) {
|
||||||
for (i = 0; i < WORLD_Y; i++)
|
for (i = 0; i < WORLD_Y; i++)
|
||||||
map[i] = &mapbuf[MAPWIDTH(3) * i];
|
map[i] = &mapbuf[MAPWIDTH(3) * i];
|
||||||
|
|
|
@ -68,7 +68,7 @@ sct(void)
|
||||||
if (!mapbuf)
|
if (!mapbuf)
|
||||||
mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
|
mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
|
||||||
if (!map) {
|
if (!map) {
|
||||||
map = malloc(WORLD_Y * sizeof(s_char *));
|
map = malloc(WORLD_Y * sizeof(char *));
|
||||||
if (map && mapbuf) {
|
if (map && mapbuf) {
|
||||||
for (i = 0; i < WORLD_Y; i++)
|
for (i = 0; i < WORLD_Y; i++)
|
||||||
map[i] = &mapbuf[MAPWIDTH(1) * i];
|
map[i] = &mapbuf[MAPWIDTH(1) * i];
|
||||||
|
|
|
@ -90,7 +90,7 @@ surv(void)
|
||||||
if (!mapbuf)
|
if (!mapbuf)
|
||||||
mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
|
mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
|
||||||
if (!map) {
|
if (!map) {
|
||||||
map = malloc(WORLD_Y * sizeof(s_char *));
|
map = malloc(WORLD_Y * sizeof(char *));
|
||||||
if (map && mapbuf) {
|
if (map && mapbuf) {
|
||||||
for (i = 0; i < WORLD_Y; i++)
|
for (i = 0; i < WORLD_Y; i++)
|
||||||
map[i] = &mapbuf[MAPWIDTH(1) * i];
|
map[i] = &mapbuf[MAPWIDTH(1) * i];
|
||||||
|
|
|
@ -73,7 +73,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
|
||||||
if (!wmapbuf)
|
if (!wmapbuf)
|
||||||
wmapbuf = malloc(WORLD_Y * MAPWIDTH(1));
|
wmapbuf = malloc(WORLD_Y * MAPWIDTH(1));
|
||||||
if (!wmap) {
|
if (!wmap) {
|
||||||
wmap = malloc(WORLD_Y * sizeof(s_char *));
|
wmap = malloc(WORLD_Y * sizeof(char *));
|
||||||
if (wmap && wmapbuf) {
|
if (wmap && wmapbuf) {
|
||||||
for (i = 0; i < WORLD_Y; i++)
|
for (i = 0; i < WORLD_Y; i++)
|
||||||
wmap[i] = &wmapbuf[MAPWIDTH(1) * i];
|
wmap[i] = &wmapbuf[MAPWIDTH(1) * i];
|
||||||
|
|
|
@ -93,7 +93,7 @@ radmap2(int owner,
|
||||||
if (!visbuf)
|
if (!visbuf)
|
||||||
visbuf = malloc(WORLD_Y * (WORLD_X + 1));
|
visbuf = malloc(WORLD_Y * (WORLD_X + 1));
|
||||||
if (!rad) {
|
if (!rad) {
|
||||||
rad = malloc(WORLD_Y * sizeof(s_char *));
|
rad = malloc(WORLD_Y * sizeof(char *));
|
||||||
if (rad && radbuf) {
|
if (rad && radbuf) {
|
||||||
for (x = 0; x < WORLD_Y; x++)
|
for (x = 0; x < WORLD_Y; x++)
|
||||||
rad[x] = &radbuf[(WORLD_X + 1) * x];
|
rad[x] = &radbuf[(WORLD_X + 1) * x];
|
||||||
|
|
|
@ -73,7 +73,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
|
||||||
if (!radbuf)
|
if (!radbuf)
|
||||||
radbuf = malloc(WORLD_Y * (WORLD_X + 1));
|
radbuf = malloc(WORLD_Y * (WORLD_X + 1));
|
||||||
if (!rad) {
|
if (!rad) {
|
||||||
rad = malloc(WORLD_Y * sizeof(s_char *));
|
rad = malloc(WORLD_Y * sizeof(char *));
|
||||||
if (rad && radbuf) {
|
if (rad && radbuf) {
|
||||||
for (rx = 0; rx < WORLD_Y; rx++)
|
for (rx = 0; rx < WORLD_Y; rx++)
|
||||||
rad[rx] = &radbuf[(WORLD_X + 1) * rx];
|
rad[rx] = &radbuf[(WORLD_X + 1) * rx];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue