did a bunch of work on map stuff going to add fg layer sometime woon

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

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 3d97e863db93678025adcd2049e9c69f3c2877d5..defa4a9abb2cc33447e70a244c24019c03f94cd6 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -32,7 +32,7 @@ int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
        return -1;\r
 }\r
 \r
-//this function is quite messy ^^; sorry! it is a quick and dirty fix~\r
+/*//this function is quite messy ^^; sorry! it is a quick and dirty fix~\r
 word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q) {\r
        dword i;\r
        word j;//, k;\r
@@ -53,18 +53,18 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
        if (count == 0) {\r
                return 0;\r
        }\r
-       /* We may want to do strtol() here to get numeric value */\r
+       // We may want to do strtol() here to get numeric value\r
 //0000fprintf(stderr, "t->type=%d\n", t->type);\r
        if (t->type == JSMN_PRIMITIVE) {\r
                if(strstr(js_sv, "data"))\r
                {\r
-                       /*\r
-                               here we should recursivly call dump again here to skip over the array until we get the facking width of the map.\r
-                               so we can initiate the map which allocates the facking map->tiles->data->data properly and THEN we can return\r
-                               here to read the data.... That is my design for this... wwww\r
+                       //\r
+                       //      here we should recursivly call dump again here to skip over the array until we get the width of the map.\r
+                       //      so we can initiate the map which allocates the facking map->tiles ->data->data properly and THEN we can return\r
+                       //      here to read the data.... That is my design for this... wwww\r
 \r
-                               FUCK well i am stuck.... wwww\r
-                       */\r
+                       //      well i am stuck.... wwww\r
+                       //\r
                        map->data[q] = (byte)atoi(js+t->start);\r
                        #ifdef DEBUG_MAPDATA\r
                                fprintf(stdout, "%d[%d]", q, map->data[q]);\r
@@ -87,7 +87,7 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
                        #endif\r
                }\r
                return 1;\r
-               /* We may use strndup() to fetch string value */\r
+               // We may use strndup() to fetch string value\r
        } else if (t->type == JSMN_STRING) {\r
                if(jsoneq(js, t, "data") == 0)\r
                {\r
@@ -101,8 +101,8 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
 //                     bp = bitmapLoadPcx("data/koishi^^.pcx");\r
                        map->tiles->btdata = &bp;\r
 //----                 map->tiles->data = planar_buf_from_bitmap(&bp);\r
-                       //map->tiles->data->data = malloc((16/**2*/)*16);\r
-                       //map->tiles->data->width = (16/**2*/);\r
+                       //map->tiles->data->data = malloc((16)*16);\r
+                       //map->tiles->data->width = (16/);\r
                        //map->tiles->data->height= 16;\r
                        map->tiles->tileHeight = 16;\r
                        map->tiles->tileWidth = 16;\r
@@ -164,10 +164,10 @@ int loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
 \r
        FILE *fh = fopen(mn, "r");\r
 \r
-       /* Prepare parser */\r
+       // Prepare parser\r
        jsmn_init(&p);\r
 \r
-       /* Allocate some tokens as a start */\r
+       // Allocate some tokens as a start\r
 //0000fprintf(stderr, "tok malloc\n");\r
        tok = malloc(sizeof(*tok) * tokcount);\r
        if (tok == NULL) {\r
@@ -176,7 +176,7 @@ int loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        }\r
 \r
        for (;;) {\r
-               /* Read another chunk */\r
+               // Read another chunk\r
 //0000fprintf(stderr, "read\n");\r
                r = fread(buf, 1, sizeof(buf), fh);\r
                if (r < 0) {\r
@@ -205,9 +205,9 @@ int loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
 again:\r
 //0000fprintf(stdout, "        parse~ tok=%zu  jslen=%zu       r=%d    _memavl()=%u    BUFSIZ=%d~\n", tokcount, jslen, r, _memavl(), BUFSIZ);\r
 //0000fprintf(stdout, "p=[%u]  [%u]    [%d]\n", p.pos, p.toknext, p.toksuper);\r
-/*\r
-               I think it crashes on the line below when it tries to parse the data of huge maps... wwww this is a jsmn problem wwww\r
-*/\r
+//\r
+//             I think it crashes on the line below when it tries to parse the data of huge maps... wwww this is a jsmn problem wwww\r
+//\r
                r = jsmn_parse(&p, js, jslen, tok, tokcount);\r
 //0000fprintf(stdout, "r=      [%d]\n", r);\r
                if (r < 0) {\r
@@ -246,10 +246,11 @@ again:
        //fclose(fh);\r
 \r
        return 0;\r
-}\r
+}*/\r
 \r
 void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {\r
        int i, j, k, indent=0, inner_end;\r
+       char *s;\r
        //bitmap_t bp;\r
 \r
        i = 0;\r
@@ -290,32 +291,32 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
                }\r
                if(jsoneq(js, &(t[i]), "tilesets") == 0) {\r
                        i++;\r
-                       map->tiles = malloc(sizeof(tiles_t*) * t[i].size);\r
                        inner_end = t[i].end;\r
                        k = 0;\r
                        while(t[i].start < inner_end) {\r
                                if(jsoneq(js, &(t[i]), "image") == 0) {\r
                                        map->layertile[k] = malloc(sizeof(tiles_t));\r
-                                       //Fix to load tileset specified.\r
+                                       s = remove_ext((char *)js+t[i+1].start, '.', '/');\r
+                                       strcpy(map->layertile[k]->imgname, s);\r
                                        //And move to vrs, probably\r
 //                                     bp = bitmapLoadPcx("data/ed.pcx");\r
 //                                     map->layertile[k]->btdata = &bp;\r
-                                       map->layertile[k]->btdata = malloc(sizeof(bitmap_t));\r
-                                       map->layertile[k]->tileHeight = 16;\r
-                                       map->layertile[k]->tileWidth = 16;\r
+                                       //map->layertile[k]->btdata = malloc(sizeof(bitmap_t));\r
                                        map->layertile[k]->rows = 1;\r
                                        map->layertile[k]->cols = 1;\r
 #ifdef __DEBUG_MAP__\r
                                        dbg_maptext=false;\r
 #endif\r
-                                       map->tiles->btdata = map->layertile[k]->btdata;\r
-                                       map->tiles->tileHeight = 16;\r
-                                       map->tiles->tileWidth = 16;\r
-                                       map->tiles->rows = 1;\r
-                                       map->tiles->cols = 1;\r
-                                       k++;\r
+                                       i++;\r
+                               }else if(jsoneq(js, &(t[i]), "tileheight") == 0) {\r
+                                       map->layertile[k]->tileHeight = atoi(js + t[i+1].start);\r
+                                       i++;\r
+                               }else if(jsoneq(js, &(t[i]), "tilewidth") == 0) {\r
+                                       map->layertile[k]->tileWidth = atoi(js + t[i+1].start);\r
+                                       i++;\r
                                }\r
                                i++;\r
+                               k++;\r
                        }\r
                }\r
 \r