trying to fix~ palette updater bug! wwww

[16.git] / src / lib / mapread.c

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index cd4f5c30222df31186c55e183dff1a1360934a6a..d3fdbdaec3bc911af675fb5012b85b94b62224d1 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -9,14 +9,14 @@ 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 *w*/) {
+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;
+       bitmap_t bp;
        if (count == 0) {
                return 0;
        }
        /* We may want to do strtol() here to get numeric value */
        if (t->type == JSMN_PRIMITIVE) {
-               //if(w)
                if(js_sv == "data")
                {
                        /*
@@ -26,11 +26,8 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 
                                FUCK well i am stuck.... wwww
                        */
-                       //bgdata[q] = strtol(js+t->start, (char **)js+t->end, 10);
-                       //if(strtol(js+t->start, (char **)js+t->end, 10)==0){ /*printf("%d\n", sizeof(map->tiles->data->data));*/ fprintf(stderr, "\nFACK! %d\n", errno); exit(-1); }
-                       //printf("%.*s", (t-1)->end - (t-1)->start, js+(t-1)->start);
-                       map->tiles->data->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 0);
-                       printf("[%d]", map->tiles->data->data[q]);
+                       map->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 10);
+//                     printf("%d[%d]", q, map->data[q]);
                }
                else
                if(js_sv == "height")
@@ -40,37 +37,37 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
                        //printf("h:[%d]\n", map->height);
                }else if(js_sv == "width")
                {
-                       //map->width = (int)malloc(sizeof(int));
                        map->width = (int)strtol(js+t->start, (char **)js+t->end, 10);
-                       printf("w:[%d]\n", map->width);
+//                     printf("w:[%d]\n", map->width);
                }
                return 1;
                /* We may use strndup() to fetch string value */
        } else if (t->type == JSMN_STRING) {
-               //printf("'%.*s'", t->end - t->start, js+t->start);
-               //if(w)
                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);
+//                     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));
-                       map->tiles->data = malloc(sizeof(bitmap_t));
-                       map->tiles->data->width = (16*2);
-                       map->tiles->data->height= 16;
-                       map->tiles->data->data = malloc((16*2)*16);
+                       //map->tiles->data = malloc(sizeof(bitmap_t));
+                       bp = bitmapLoadPcx("data/ed.pcx");
+                       map->tiles->data = &bp;
+                       //map->tiles->data->data = malloc((16/**2*/)*16);
+                       //map->tiles->data->width = (16/**2*/);\r
+                       //map->tiles->data->height= 16;\r
+                       map->tiles->tileHeight = 16;\r
+                       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);
-                       //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);
                }else if (jsoneq(js, t, "width") == 0 && indent==1)
                {
                        js_sv="width";//strdup(js+t->start);//, t->end - t->start);
-                       //printf("%s\n", js_sv);
                }else js_sv=NULL;
                return 1;
        } else if (t->type == JSMN_OBJECT) {
@@ -78,9 +75,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, i/*, w*/);
+                       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/*, w*/);
+                       j += dump(js, t+1+j, count-j, indent+1, map, i);
                        //printf("\n");
                }
                return j+1;
@@ -88,10 +85,9 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
                j = 0;
                //printf("==\n");
                for (i = 0; i < t->size; i++) {
-                       //if(bgdata==NULL) bgdata=malloc(sizeof(char)*t->size);
                        //for (k = 0; k < indent-1; k++) printf("\t");
                        //printf("\t-");
-                       j += dump(js, t+1+j, count-j, indent+1, map, i/*, &t->size*/);
+                       j += dump(js, t+1+j, count-j, indent+1, map, i);
                        //printf("==\n");
                }
                return j+1;
@@ -99,7 +95,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
        return 0;
 }
 
-static int loadmap(char *mn, map_t *map/*, word w*/)
+static int loadmap(char *mn, map_t *map)
 {
        int r;
        int eof_expected = 0;
@@ -145,13 +141,10 @@ static int loadmap(char *mn, map_t *map/*, word w*/)
                        return 3;
                }
                strncpy(js + jslen, buf, r);
-//             printf("%s\n\n", js);
                jslen = jslen + r;
 
 again:
-               //printf("================================================================================%s================================================================================", js);
                r = jsmn_parse(&p, js, jslen, tok, tokcount);
-               //printf("================================================================================%s================================================================================", js);
                if (r < 0) {
                        if (r == JSMN_ERROR_NOMEM) {
                                tokcount = tokcount * 2;
@@ -163,8 +156,6 @@ again:
                                goto again;
                        }
                } else {
-                       //printf("================================================================================%s================================================================================", js);
-                       //js_sv=malloc(sizeof(char)*10);
                        dump(js, tok, p.toknext, 0, map, 0);
                        eof_expected = 1;
                }