X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=23cbfa0d2f88618d797b202d9de952e38bfc8a5f;hb=535f618e80aa6546e61907026b2451e123655a5b;hp=d3fdbdaec3bc911af675fb5012b85b94b62224d1;hpb=45657b1dabbedfa7c186957a02e0944341b54217;p=16.git diff --git a/src/lib/mapread.c b/src/lib/mapread.c old mode 100644 new mode 100755 index d3fdbdae..23cbfa0d --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -1,6 +1,6 @@ #include "src/lib/mapread.h" -static int jsoneq(const char *json, jsmntok_t *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(json + tok->start, s, tok->end - tok->start) == 0) { return 0; @@ -9,15 +9,30 @@ static int jsoneq(const char *json, jsmntok_t *tok, const char *s) { } //this function is quite messy ^^; sorry! it is a quick and dirty fix~ -static int dump(const char *js, jsmntok_t *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) + { + fprintf(stdout, "%s\n", js); + fprintf(stdout, "\n"); + } + #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 if (count == 0) { 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(js_sv == "data") + if(strstr(js_sv, "data")) { /* here we should recursivly call dump again here to skip over the array until we get the facking width of the map. @@ -26,82 +41,96 @@ static int dump(const char *js, jsmntok_t *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); -// printf("%d[%d]", q, map->data[q]); + map->data[q] = (byte)atoi(js+t->start); + #ifdef DEBUG_MAPDATA + fprintf(stdout, "%d[%d]", q, map->data[q]); + #endif } else - if(js_sv == "height") + if(strstr(js_sv, "height")) { - //map->height = (int)malloc(sizeof(int)); - map->height = (int)strtol(js+t->start, (char **)js+t->end, 10); - //printf("h:[%d]\n", map->height); - }else if(js_sv == "width") + 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 = (int)strtol(js+t->start, (char **)js+t->end, 10); -// printf("w:[%d]\n", map->width); + map->width = atoi(js+t->start); + #ifdef DEBUG_MAPVAR + fprintf(stdout, "indent= [%d] ", indent); + fprintf(stdout, "w:[%d]\n", map->width); + #endif } return 1; /* We may use strndup() to fetch string value */ } else if (t->type == JSMN_STRING) { - if(jsoneq(js, t, "data") == 0 ) + if(jsoneq(js, t, "data") == 0) { -// printf("[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size); -// printf("\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size); +// 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->tiles->data = malloc(sizeof(bitmap_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; - js_sv="data";//strdup(js+t->start);//, t->end - t->start); + map->tiles->debug_text=false; + strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start); } else - if (jsoneq(js, t, "height") == 0 && indent==1) + if (jsoneq(js, t, "height") == 0 && indent<=1) { - js_sv="height";//strdup(js+t->start);//, t->end - t->start); - }else if (jsoneq(js, t, "width") == 0 && indent==1) + strcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start); + }else + if(jsoneq(js, t, "width") == 0 && indent<=1) { - js_sv="width";//strdup(js+t->start);//, t->end - t->start); - }else js_sv=NULL; + strcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start); + }else strcpy(js_sv, "\0"); return 1; } else if (t->type == JSMN_OBJECT) { - //printf("\n"); + //fprintf(stdout, "\n"); j = 0; for (i = 0; i < t->size; i++) { - //for (k = 0; k < indent; k++) printf("\t"); - j += dump(js, t+1+j, count-j, indent+1, map, i); - //printf(": "); - j += dump(js, t+1+j, count-j, indent+1, map, i); - //printf("\n"); + //for (k = 0; k < indent; k++) fprintf(stdout, "\t"); + j += dump(js, t+1+j, count-j, indent+1, js_sv, map, i); + //fprintf(stdout, ": "); + j += dump(js, t+1+j, count-j, indent+1, js_sv, map, i); + //fprintf(stdout, "\n"); } return j+1; } else if (t->type == JSMN_ARRAY) { j = 0; - //printf("==\n"); + //fprintf(stdout, "==\n"); for (i = 0; i < t->size; i++) { - //for (k = 0; k < indent-1; k++) printf("\t"); - //printf("\t-"); - j += dump(js, t+1+j, count-j, indent+1, map, i); - //printf("==\n"); + //for (k = 0; k < indent-1; k++) fprintf(stdout, "\t"); + //fprintf(stdout, "\t-"); + j += dump(js, t+1+j, count-j, indent+1, js_sv, map, i); + //fprintf(stdout, "==\n"); } return j+1; } return 0; } -static int loadmap(char *mn, map_t *map) +int loadmap(char *mn, map_t *map) { int r; + static word incr=0; int eof_expected = 0; char *js = NULL; size_t jslen = 0; char buf[BUFSIZ]; + static char js_ss[16]; jsmn_parser p; jsmntok_t *tok; @@ -113,6 +142,7 @@ static int loadmap(char *mn, map_t *map) jsmn_init(&p); /* Allocate some tokens as a start */ +//0000fprintf(stderr, "tok malloc\n"); tok = malloc(sizeof(*tok) * tokcount); if (tok == NULL) { fprintf(stderr, "malloc(): errno=%d\n", errno); @@ -121,6 +151,7 @@ static 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); @@ -134,9 +165,11 @@ static int loadmap(char *mn, map_t *map) return 2; } } - +//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; } @@ -144,10 +177,17 @@ static int loadmap(char *mn, map_t *map) jslen = jslen + r; again: +//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; +//0000fprintf(stderr, "tok realloc~ %zu\n", tokcount); tok = realloc(tok, sizeof(*tok) * tokcount); if (tok == NULL) { fprintf(stderr, "realloc(): errno=%d\n", errno); @@ -156,7 +196,21 @@ again: goto again; } } else { - dump(js, tok, p.toknext, 0, map, 0); + //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; } }