X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=23cbfa0d2f88618d797b202d9de952e38bfc8a5f;hb=535f618e80aa6546e61907026b2451e123655a5b;hp=e53994b72420d06259195564c35b50a8db1733e4;hpb=0cc522c7a32bf1e062312f586715fdd2fd6c7d82;p=16.git diff --git a/src/lib/mapread.c b/src/lib/mapread.c old mode 100644 new mode 100755 index e53994b7..23cbfa0d --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -1,16 +1,16 @@ #include "src/lib/mapread.h" -int jsoneq(const char huge *json, jsmntok_t huge *tok, const char huge *s) { - if (tok->type == JSMN_STRING && (int)_fstrlen(s) == tok->end - tok->start && - _fstrncmp((char const *)json + tok->start, s, tok->end - tok->start) == 0) { +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; } return -1; } //this function is quite messy ^^; sorry! it is a quick and dirty fix~ -word dump(const char huge *js, jsmntok_t huge *t, size_t count, word indent, char *js_sv, map_t *map, unsigned long q) { - unsigned long i; +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 @@ -32,7 +32,7 @@ word dump(const char huge *js, jsmntok_t huge *t, size_t count, word indent, cha /* 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(_fstrstr(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. @@ -41,25 +41,22 @@ word dump(const char huge *js, jsmntok_t huge *t, size_t count, word indent, cha 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 } else - if(_fstrstr(js_sv, "height")) + 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(_fstrstr(js_sv, "width")) + }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); @@ -72,31 +69,33 @@ word dump(const char huge *js, jsmntok_t huge *t, size_t count, word indent, cha { // 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)); + 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; - _fstrcpy(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) { - _fstrcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start); + strcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start); }else if(jsoneq(js, t, "width") == 0 && indent<=1) { - _fstrcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start); - }else _fstrcpy(js_sv, "\0"); + 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) { //fprintf(stdout, "\n"); @@ -128,14 +127,13 @@ int loadmap(char *mn, map_t *map) int r; static word incr=0; int eof_expected = 0; - char huge *js = NULL; + char *js = NULL; size_t jslen = 0; char buf[BUFSIZ]; - char huge *buff = &buf; static char js_ss[16]; jsmn_parser p; - jsmntok_t huge *tok; + jsmntok_t *tok; size_t tokcount = 2; FILE *fh = fopen(mn, "r"); @@ -145,7 +143,7 @@ int loadmap(char *mn, map_t *map) /* Allocate some tokens as a start */ //0000fprintf(stderr, "tok malloc\n"); - tok = _fmalloc(sizeof(*tok) * tokcount); + tok = malloc(sizeof(*tok) * tokcount); if (tok == NULL) { fprintf(stderr, "malloc(): errno=%d\n", errno); return 3; @@ -169,13 +167,13 @@ int loadmap(char *mn, map_t *map) } //0000fprintf(stdout, "r= [%d] BUFSIZ=%d\n", r, BUFSIZ); //0000fprintf(stderr, "js alloc~\n"); - js = _frealloc(js, jslen + r + 1); + js = realloc(js, jslen + r + 1); if (js == NULL) { fprintf(stderr, "*js=%Fp\n", *js); fprintf(stderr, "realloc(): errno = %d\n", errno); return 3; } - _fstrncpy(js + jslen, &(*buff), r); + strncpy(js + jslen, buf, r); jslen = jslen + r; again: @@ -184,13 +182,13 @@ again: /* 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); + 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 = _frealloc(tok, sizeof(*tok) * tokcount); + tok = realloc(tok, sizeof(*tok) * tokcount); if (tok == NULL) { fprintf(stderr, "realloc(): errno=%d\n", errno); return 3; @@ -200,7 +198,7 @@ again: } else { //printf("js=%Fp\n", (js)); //printf("*js=%Fp\n", (*(js))); - printf("&*js=%s\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)); @@ -212,14 +210,13 @@ again: #ifdef DEBUG_DUMPVARS fprintf(stdout, "running dump~\n"); #endif -//++++ dump(js, tok, p.toknext, incr, &js_ss, map, 0); + dump(js, tok, p.toknext, incr, &js_ss, map, 0); eof_expected = 1; } } - _ffree(js); - _ffree(buff); - _ffree(tok); + free(js); + free(tok); fclose(fh); return 0;