X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=777de7da29f645b238714f67ea2da658023603aa;hb=4e9c69f2b1452b68cd173340037c5036928840db;hp=e3f40b441bbee036658cc132a5a95a89d4a28a17;hpb=3aa2d573c4dace5af78bf8f8f21e46ca36334803;p=16.git diff --git a/src/lib/mapread.c b/src/lib/mapread.c index e3f40b44..777de7da 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -69,8 +69,8 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, { // fprintf(stdout, "[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size); // fprintf(stdout, "\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size); - map->data = malloc(sizeof(byte) * (t+1)->size); - map->tiles = malloc(sizeof(tiles_t)); + map->data = _nmalloc(sizeof(byte) * (t+1)->size); + map->tiles = _nmalloc(sizeof(tiles_t)); //map->tiles->data = malloc(sizeof(bitmap_t)); //fix this to be far~ bp = bitmapLoadPcx("data/ed.pcx"); @@ -127,7 +127,6 @@ int loadmap(char *mn, map_t *map) char *js = NULL; size_t jslen = 0; char buf[BUFSIZ]; -//---- char *buff = &buf; static char js_ss[16]; jsmn_parser p;