X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=f1e7c571dae2b4198ec9d028081412365221a0df;hb=0797174ac571f1ff80ba3fa86ae362cd10864e14;hp=aa9761ec623d25ce7c35cd46604c96eef6dc4ddb;hpb=2bab9c38c2b93c18474dd9189f1801eb13508a5e;p=16.git diff --git a/src/lib/mapread.c b/src/lib/mapread.c index aa9761ec..f1e7c571 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -1,15 +1,15 @@ #include "src/lib/mapread.h" -int jsoneq(const char /*far*/ *json, jsmntok_t /*far*/ *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) { +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) { return 0; } return -1; } //this function is quite messy ^^; sorry! it is a quick and dirty fix~ -int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent, char *js_sv, map_t *map, int q) { +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; bitmap_t bp; #ifdef DEBUG_JS @@ -28,7 +28,7 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent, } /* We may want to do strtol() here to get numeric value */ if (t->type == JSMN_PRIMITIVE) { - if(strstr(js_sv, "data")) + if(_fstrstr(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. @@ -38,24 +38,24 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent, FUCK well i am stuck.... wwww */ //---- map->data[q] = (byte)strtol(js+t->start, (char **)t->end, 10); - map->data[q] = (byte)atoi(js+t->start); + map->data[q] = (byte)atoi((const char *)js+t->start); #ifdef DEBUG_MAPDATA fprintf(stdout, "%d[%d]", q, map->data[q]); #endif } else - if(strstr(js_sv, "height")) + if(_fstrstr(js_sv, "height")) { //---- map->height = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10); - map->height = (unsigned int)atoi(js+t->start); + map->height = atoi((const char *)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")) + }else if(_fstrstr(js_sv, "width")) { //---- map->width = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10); - map->width = (unsigned int)atoi(js+t->start); + map->width = atoi((const char *)js+t->start); #ifdef DEBUG_MAPVAR fprintf(stdout, "indent= [%d] ", indent); fprintf(stdout, "w:[%d]\n", map->width); @@ -68,7 +68,8 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent, { // 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 = /*_f*/malloc(sizeof(byte) * (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 @@ -81,16 +82,17 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent, map->tiles->tileWidth = 16; map->tiles->rows = 1; map->tiles->cols = 1; - strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start); + _fstrcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start); } else if (jsoneq(js, t, "height") == 0 && indent<=1) { - strcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start); - }else if(jsoneq(js, t, "width") == 0 && indent<=1) + _fstrcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start); + }else + if(jsoneq(js, t, "width") == 0 && indent<=1) { - strcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start); - }else strcpy(js_sv, "\0"); + _fstrcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start); + }else _fstrcpy(js_sv, "\0"); return 1; } else if (t->type == JSMN_OBJECT) { //fprintf(stdout, "\n"); @@ -122,13 +124,14 @@ int loadmap(char *mn, map_t *map) int r; static int incr=0; int eof_expected = 0; - char /*far*/ *js = NULL; + char huge *js = NULL; size_t jslen = 0; char buf[BUFSIZ]; + char huge *buff = &buf; static char js_ss[16]; jsmn_parser p; - jsmntok_t /*far*/ *tok; + jsmntok_t huge *tok; size_t tokcount = 2; FILE *fh = fopen(mn, "r"); @@ -137,7 +140,7 @@ int loadmap(char *mn, map_t *map) jsmn_init(&p); /* Allocate some tokens as a start */ - tok = /*_f*/malloc(sizeof(*tok) * tokcount); + tok = _fmalloc(sizeof(*tok) * tokcount); if (tok == NULL) { fprintf(stderr, "malloc(): errno=%d\n", errno); return 3; @@ -158,13 +161,13 @@ int loadmap(char *mn, map_t *map) return 2; } } - - js = /*_f*/realloc(js, jslen + r + 1); + js = _frealloc(js, jslen + r + 1); if (js == NULL) { + fprintf(stderr, "*js=%Fp\n", *js); fprintf(stderr, "realloc(): errno = %d\n", errno); return 3; } - strncpy(js + jslen, buf, r); + _fstrncpy(js + jslen, &(*buff), r); jslen = jslen + r; again: @@ -172,7 +175,7 @@ again: if (r < 0) { if (r == JSMN_ERROR_NOMEM) { tokcount = tokcount * 2; - tok = /*_f*/realloc(tok, sizeof(*tok) * tokcount); + tok = _frealloc(tok, sizeof(*tok) * tokcount); if (tok == NULL) { fprintf(stderr, "realloc(): errno=%d\n", errno); return 3; @@ -180,13 +183,25 @@ again: goto again; } } else { + //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)); dump(js, tok, p.toknext, incr, &js_ss, map, 0); eof_expected = 1; } } - /*_f*/free(js); - /*_f*/free(tok); + _ffree(js); + _ffree(buff); + _ffree(tok); fclose(fh); return 0;