From fe2aef9b2ab194e6b54f1e6fd9313c521ed3fc4b Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 23 Mar 2015 13:04:31 -0500 Subject: [PATCH] modified: scroll.exe modified: src/lib/mapread.c modified: src/lib/mapread.h modified: src/scroll.c --- scroll.exe | Bin 59274 -> 59277 bytes src/lib/mapread.c | 23 ++++++++++++++++------- src/lib/mapread.h | 2 +- src/scroll.c | 4 ++-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/scroll.exe b/scroll.exe index bd790fef504bb6c2264cea72ba06782fcbccdcf8..fd02ce14102d9237980c08cfa89d0b39463d86c8 100644 GIT binary patch delta 13145 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 MZ3X@Ux{Q$j1F&z)nE(I) diff --git a/src/lib/mapread.c b/src/lib/mapread.c index 7e0686b4..90c13a7a 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -9,14 +9,19 @@ 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) { +static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, short q) { int i, j, k; if (count == 0) { return 0; } /* We may want to do strtol() here to get numeric value */ if (t->type == JSMN_PRIMITIVE) { - if(js_sv == "height") + if(js_sv == "data") + { + map->tiles->data->data[q] = (byte)strtol(js+t->start, (char **)js+t->end, 10); + printf("[%d]", map->tiles->data->data[q]); + q++; + }else if(js_sv == "height") { map->height = (int)strtol(js+t->start, (char **)js+t->end, 10); //printf("h:[%d]\n", map->height); @@ -29,7 +34,11 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char * /* We may use strndup() to fetch string value */ } else if (t->type == JSMN_STRING) { //printf("'%.*s'", t->end - t->start, js+t->start); - if (jsoneq(js, t, "height") == 0 && indent==1) + if (jsoneq(js, t, "data") == 0 && indent==2) + { + js_sv="data";//strdup(js+t->start);//, t->end - t->start); + //printf("%s\n", js_sv); + }else if (jsoneq(js, t, "height") == 0 && indent==1) { js_sv="height";//strdup(js+t->start);//, t->end - t->start); //printf("%s\n", js_sv); @@ -44,9 +53,9 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char * 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); + j += dump(js, t+1+j, count-j, indent+1, map, q); //printf(": "); - j += dump(js, t+1+j, count-j, indent+1, map); + j += dump(js, t+1+j, count-j, indent+1, map, q); //printf("\n"); } return j+1; @@ -56,7 +65,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char * 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); + j += dump(js, t+1+j, count-j, indent+1, map, q); //printf("==\n"); } return j+1; @@ -125,7 +134,7 @@ again: goto again; } } else { - dump(js, tok, p.toknext, 0, map); + dump(js, tok, p.toknext, 0, map, 0); //fprintf(stdout, "[[[[%d]]]]\n", sizeof(tok)); //printf("[\n%d\n]", jslen); eof_expected = 1; diff --git a/src/lib/mapread.h b/src/lib/mapread.h index ac210743..fcc773a7 100644 --- a/src/lib/mapread.h +++ b/src/lib/mapread.h @@ -24,7 +24,7 @@ typedef struct { } map_t; static int jsoneq(const char *json, jsmntok_t *tok, const char *s); -static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map); +static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, short q); int loadmap(char *mn, map_t *map); #endif/*_LIBMAPREAD_H_*/ diff --git a/src/scroll.c b/src/scroll.c index 0d7d021d..f03cda5c 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -627,7 +627,7 @@ initMap(map_t *map) { map->tiles->rows = 1; map->tiles->cols = 2; - i=0; + /*i=0; for(y=0; ytiles->data->data[i] = 0;//0x34; i++; } - } + }*/ i=0; for(y=0; yheight; y++) { -- 2.39.5