too tired to continue

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

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index defa4a9abb2cc33447e70a244c24019c03f94cd6..b17eb932b3d5e51b7f9181f288dd4b76ec761be0 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -257,7 +257,7 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
        while(i<count) {\r
                if(jsoneq(js, &(t[i]), "layers") == 0) {\r
                        i++;\r
-                       map->layerdata = malloc(sizeof(byte*) * t[i].size);\r
+                       //map->layerdata = malloc(sizeof(byte*) * t[i].size);\r
                        inner_end = t[i].end;\r
                        k = 0;\r
                        while(t[i].start < inner_end) {\r
@@ -268,14 +268,13 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
 #ifdef DEBUG_MAPDATA\r
                                        printf("Layer %d data: [\n", k);\r
 #endif\r
-                                       map->layerdata[k] = malloc(sizeof(byte) * t[i+1].size);\r
-                                       map->data = map->layerdata[k];\r
+                                       map->MAPDATAPTK = malloc(sizeof(byte) * t[i+1].size);\r
+                                       //for backwards compatibility for rest of code\r
+//                                     map->data = map->MAPDATAPTK;\r
                                        for(j = 0; j < t[i+1].size; j++) {\r
-                                               map->layerdata[k][j] = (byte)atoi(js + t[i+2+j].start);\r
-                                               //for backwards compatibility for rest of code\r
-//                                             map->data[j] = map->layerdata[k][j];//(byte)atoi(js + t[i+2+j].start);//(byte)atoi(js+t->start);\r
+                                               map->MAPDATAPTK[j] = (byte)atoi(js + t[i+2+j].start);\r
 #ifdef DEBUG_MAPDATA\r
-                                               //printf("[%d,%d]%d", k, j, map->layerdata[k][j]);\r
+                                               //printf("[%d,%d]%d", k, j, map->MAPDATAPTK[j]);\r
                                                fprintf(stdout, "%c", map->data[j]+44);\r
 #endif\r
                                        }\r
@@ -295,24 +294,24 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
                        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
+                                       map->MAPTILESPTK = malloc(sizeof(tiles_t));\r
                                        s = remove_ext((char *)js+t[i+1].start, '.', '/');\r
-                                       strcpy(map->layertile[k]->imgname, s);\r
+                                       strcpy(map->MAPTILESPTK->tileset.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]->rows = 1;\r
-                                       map->layertile[k]->cols = 1;\r
+//                                     map->MAPTILESPTK->btdata = &bp;\r
+                                       //map->MAPTILESPTK->btdata = malloc(sizeof(bitmap_t));\r
+                                       map->MAPTILESPTK->rows = 1;\r
+                                       map->MAPTILESPTK->cols = 1;\r
 #ifdef __DEBUG_MAP__\r
                                        dbg_maptext=false;\r
 #endif\r
                                        i++;\r
                                }else if(jsoneq(js, &(t[i]), "tileheight") == 0) {\r
-                                       map->layertile[k]->tileHeight = atoi(js + t[i+1].start);\r
+                                       map->MAPTILESPTK->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
+                                       map->MAPTILESPTK->tileWidth = atoi(js + t[i+1].start);\r
                                        i++;\r
                                }\r
                                i++;\r