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 90c13a7a3f5ebfc21041f9f101df95f79be9fded..d3fdbdaec3bc911af675fb5012b85b94b62224d1 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -9,8 +9,9 @@ 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, short q) {
+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;
        }
@@ -18,34 +19,55 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
        if (t->type == JSMN_PRIMITIVE) {
                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")
+                       /*
+                               here we should recursivly call dump again here to skip over the array until we get the facking width of the map.
+                               so we can initiate the map which allocates the facking map->tiles->data->data properly and THEN we can return
+                               here to read the data.... That is my design for this... wwww
+
+                               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]);
+               }
+               else
+               if(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->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 (jsoneq(js, t, "data") == 0 && indent==2)
+               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));
+                       //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)
+               }
+               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) {
@@ -53,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, q);
+                       j += dump(js, t+1+j, count-j, indent+1, map, i);
                        //printf(": ");
-                       j += dump(js, t+1+j, count-j, indent+1, map, q);
+                       j += dump(js, t+1+j, count-j, indent+1, map, i);
                        //printf("\n");
                }
                return j+1;
@@ -65,7 +87,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, q);
+                       j += dump(js, t+1+j, count-j, indent+1, map, i);
                        //printf("==\n");
                }
                return j+1;
@@ -73,7 +95,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
        return 0;
 }
 
-int loadmap(char *mn, map_t *map)
+static int loadmap(char *mn, map_t *map)
 {
        int r;
        int eof_expected = 0;
@@ -115,7 +137,7 @@ int loadmap(char *mn, map_t *map)
 
                js = realloc(js, jslen + r + 1);
                if (js == NULL) {
-                       fprintf(stderr, "realloc(): errno=%d\n", errno);
+                       fprintf(stderr, "realloc(): errno = %d\n", errno);
                        return 3;
                }
                strncpy(js + jslen, buf, r);
@@ -135,18 +157,13 @@ again:
                        }
                } else {
                        dump(js, tok, p.toknext, 0, map, 0);
-                       //fprintf(stdout, "[[[[%d]]]]\n", sizeof(tok));
-                       //printf("[\n%d\n]", jslen);
                        eof_expected = 1;
                }
        }
 
-       return 0;
-}
+       free(js);
+       free(tok);
+       fclose(fh);
 
-/*int main()
-{
-       map_t map;
-       loadmap("../../../../data/test.map", &map);
        return 0;
-}*/
+}