X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=23cbfa0d2f88618d797b202d9de952e38bfc8a5f;hb=7a3b6f331f36735ef30027236eb447439583d43d;hp=4e513eb4d661059170ff812690fa3e659ad92b2c;hpb=8e7cced60cc3375099328304114e9a1ce4ea5139;p=16.git diff --git a/src/lib/mapread.c b/src/lib/mapread.c old mode 100644 new mode 100755 index 4e513eb4..23cbfa0d --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -1,16 +1,17 @@ #include "src/lib/mapread.h" -int jsoneq(const char huge *json, jsmntok_t huge *tok, const char *s) { +int jsoneq(const char *json, jsmntok_t *tok, const char *s) { if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start && - strncmp((char const near *)json + tok->start, s, tok->end - tok->start) == 0) { + strncmp(json + tok->start, s, tok->end - tok->start) == 0) { return 0; } return -1; } //this function is quite messy ^^; sorry! it is a quick and dirty fix~ -int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char *js_sv, map_t *map, int q) { - int i, j, k; +word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q) { + dword i; + word j;//, k; bitmap_t bp; #ifdef DEBUG_JS if(indent==0) @@ -20,6 +21,8 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char } #endif #ifdef DEBUG_DUMPVARS + fprintf(stdout, "t->size=[%d] ", t->size); + fprintf(stdout, "q=[%d] ", q); fprintf(stdout, "indent= [%d] ", indent); fprintf(stdout, "js_sv= [%s]\n", js_sv); #endif @@ -27,6 +30,7 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char return 0; } /* We may want to do strtol() here to get numeric value */ +//0000fprintf(stderr, "t->type=%d\n", t->type); if (t->type == JSMN_PRIMITIVE) { if(strstr(js_sv, "data")) { @@ -37,8 +41,7 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char FUCK well i am stuck.... wwww */ -//---- map->data[q] = (byte)strtol(js+t->start, (char **)t->end, 10); - map->data[q] = (byte)atoi((const char *)js+t->start); + map->data[q] = (byte)atoi(js+t->start); #ifdef DEBUG_MAPDATA fprintf(stdout, "%d[%d]", q, map->data[q]); #endif @@ -46,16 +49,14 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char else if(strstr(js_sv, "height")) { -//---- map->height = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10); - map->height = atoi((const char *)js+t->start); + map->height = atoi(js+t->start); #ifdef DEBUG_MAPVAR fprintf(stdout, "indent= [%d] ", indent); fprintf(stdout, "h:[%d]\n", map->height); #endif }else if(strstr(js_sv, "width")) { -//---- map->width = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10); - map->width = atoi((const char *)js+t->start); + map->width = atoi(js+t->start); #ifdef DEBUG_MAPVAR fprintf(stdout, "indent= [%d] ", indent); fprintf(stdout, "w:[%d]\n", map->width); @@ -68,20 +69,22 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char { // 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 = halloc(sizeof(byte) * (t+1)->size, sizeof(byte)); - //map->data = malloc(sizeof(byte) * (t+1)->size); - map->tiles = /*_f*/malloc(sizeof(tiles_t)); - //map->tiles->data = malloc(sizeof(bitmap_t)); - //fix this + map->data = malloc(sizeof(byte) * (t+1)->size); + map->tiles = malloc(sizeof(tiles_t)); + map->tiles->btdata = malloc(sizeof(bitmap_t)); + //fix this to be far~ bp = bitmapLoadPcx("data/ed.pcx"); - map->tiles->data = &bp; +// bp = bitmapLoadPcx("data/koishi^^.pcx"); + map->tiles->btdata = &bp; + map->tiles->data = planar_buf_from_bitmap(&bp); //map->tiles->data->data = malloc((16/**2*/)*16); - //map->tiles->data->width = (16/**2*/); - //map->tiles->data->height= 16; - map->tiles->tileHeight = 16; - map->tiles->tileWidth = 16; - map->tiles->rows = 1; + //map->tiles->data->width = (16/**2*/); + //map->tiles->data->height= 16; + map->tiles->tileHeight = 16; + map->tiles->tileWidth = 16; + map->tiles->rows = 1; map->tiles->cols = 1; + map->tiles->debug_text=false; strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start); } else @@ -122,16 +125,15 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char int loadmap(char *mn, map_t *map) { int r; - static int incr=0; + static word incr=0; int eof_expected = 0; - char *jz = NULL; - char huge *js = NULL; + char *js = NULL; size_t jslen = 0; char buf[BUFSIZ]; static char js_ss[16]; jsmn_parser p; - jsmntok_t huge *tok; + jsmntok_t *tok; size_t tokcount = 2; FILE *fh = fopen(mn, "r"); @@ -140,7 +142,8 @@ int loadmap(char *mn, map_t *map) jsmn_init(&p); /* Allocate some tokens as a start */ - tok = _fmalloc(sizeof(*tok) * tokcount); +//0000fprintf(stderr, "tok malloc\n"); + tok = malloc(sizeof(*tok) * tokcount); if (tok == NULL) { fprintf(stderr, "malloc(): errno=%d\n", errno); return 3; @@ -148,6 +151,7 @@ int loadmap(char *mn, map_t *map) for (;;) { /* Read another chunk */ +//0000fprintf(stderr, "read\n"); r = fread(buf, 1, sizeof(buf), fh); if (r < 0) { fprintf(stderr, "fread(): %d, errno=%d\n", r, errno); @@ -161,26 +165,30 @@ int loadmap(char *mn, map_t *map) return 2; } } - jz = realloc(jz, jslen + r + 1); - //js = _frealloc(js, jslen + r + 1); - if (jz == NULL) { - fprintf(stderr, "*js=%s\n", *js); - fprintf(stderr, "*jz=%s\n", *jz); +//0000fprintf(stdout, "r= [%d] BUFSIZ=%d\n", r, BUFSIZ); +//0000fprintf(stderr, "js alloc~\n"); + js = realloc(js, jslen + r + 1); + if (js == NULL) { + fprintf(stderr, "*js=%Fp\n", *js); fprintf(stderr, "realloc(): errno = %d\n", errno); return 3; } - //printf("_fstrncpy~\n"); - strncpy(jz + jslen, buf, r); - //printf("_fstrncpy okies~~\n"); + strncpy(js + jslen, buf, r); jslen = jslen + r; again: - js = (char huge *)*jz; +//0000fprintf(stdout, " parse~ tok=%zu jslen=%zu r=%d _memavl()=%u BUFSIZ=%d~\n", tokcount, jslen, r, _memavl(), BUFSIZ); +//0000fprintf(stdout, "p=[%u] [%u] [%d]\n", p.pos, p.toknext, p.toksuper); +/* + I think it crashes on the line below when it tries to parse the data of huge maps... wwww this is a jsmn problem wwww +*/ r = jsmn_parse(&p, js, jslen, tok, tokcount); +//0000fprintf(stdout, "r= [%d]\n", r); if (r < 0) { if (r == JSMN_ERROR_NOMEM) { tokcount = tokcount * 2; - tok = _frealloc(tok, sizeof(*tok) * tokcount); +//0000fprintf(stderr, "tok realloc~ %zu\n", tokcount); + tok = realloc(tok, sizeof(*tok) * tokcount); if (tok == NULL) { fprintf(stderr, "realloc(): errno=%d\n", errno); return 3; @@ -188,15 +196,27 @@ again: goto again; } } else { - //printf("*buff=[\n%s\n]\n", *buff); - //printf("buff=[\n%Fp\n]\n", buff); + //printf("js=%Fp\n", (js)); + //printf("*js=%Fp\n", (*(js))); + //printf("&*js=%s\n", &(*(js))); + //printf("&buf=[%Fp]\n", &buf); + //printf("&buf_seg=[%x]\n", FP_SEG(&buf)); + //printf("&buf_off=[%x]\n", FP_OFF(&buf)); + //printf("&buf_fp=[%Fp]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf))); + //printf("buf=[\n%s\n]\n", buf); + //printf("buff=[%Fp]\n", buff); + //printf("(*buff)=[%Fp]\n", (*buff)); + //printf("&(*buff)=[\n%s\n]\n", &(*buff)); + #ifdef DEBUG_DUMPVARS + fprintf(stdout, "running dump~\n"); + #endif dump(js, tok, p.toknext, incr, &js_ss, map, 0); eof_expected = 1; } } - hfree(js); - hfree(tok); + free(js); + free(tok); fclose(fh); return 0;