#include "src/lib/mapread.h"
-static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
+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) {
return 0;
}
//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 dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent, char *js_sv, map_t *map, int q) {
int i, 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, "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 */
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.
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)strtol(js+t->start, (char **)t->end, 10);
+ 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 = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
+ map->height = (unsigned int)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 = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
+ map->width = (unsigned int)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);
- map->data = malloc(sizeof(byte) * (t+1)->size);
- map->tiles = malloc(sizeof(tiles_t));
+// 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->tiles = /*_f*/malloc(sizeof(tiles_t));
//map->tiles->data = malloc(sizeof(bitmap_t));
//fix this
bp = bitmapLoadPcx("data/ed.pcx");
map->tiles->tileWidth = 16;\r
map->tiles->rows = 1;\r
map->tiles->cols = 1;
- js_sv="data";//strdup(js+t->start);//, t->end - t->start);
+ 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 int incr=0;
int eof_expected = 0;
- char *js = NULL;
+ char /*far*/ *js = NULL;
size_t jslen = 0;
char buf[BUFSIZ];
+ static char js_ss[16];
jsmn_parser p;
- jsmntok_t *tok;
+ jsmntok_t /*far*/ *tok;
size_t tokcount = 2;
FILE *fh = fopen(mn, "r");
jsmn_init(&p);
/* Allocate some tokens as a start */
- tok = malloc(sizeof(*tok) * tokcount);
+ tok = /*_f*/malloc(sizeof(*tok) * tokcount);
if (tok == NULL) {
fprintf(stderr, "malloc(): errno=%d\n", errno);
return 3;
}
}
- js = realloc(js, jslen + r + 1);
+ js = /*_f*/realloc(js, jslen + r + 1);
if (js == NULL) {
fprintf(stderr, "realloc(): errno = %d\n", errno);
return 3;
if (r < 0) {
if (r == JSMN_ERROR_NOMEM) {
tokcount = tokcount * 2;
- tok = realloc(tok, sizeof(*tok) * tokcount);
+ tok = /*_f*/realloc(tok, sizeof(*tok) * tokcount);
if (tok == NULL) {
fprintf(stderr, "realloc(): errno=%d\n", errno);
return 3;
goto again;
}
} else {
- dump(js, tok, p.toknext, 0, map, 0);
+ dump(js, tok, p.toknext, incr, &js_ss, map, 0);
eof_expected = 1;
}
}
- free(js);
- free(tok);
+ /*_f*/free(js);
+ /*_f*/free(tok);
fclose(fh);
return 0;
projects / 16.git / blobdiff