== taking break still not working ==

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

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 3bd1dbe1cab35e7c185329b1c231a8fa5b2e04e9..864d0b160f41a21208a382c44c0f059d10cc4bc2 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -327,29 +327,29 @@ 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->MAPTILESPTK = malloc(sizeof(tiles_t));\r
+                                       map->tiles = malloc(sizeof(tiles_t));\r
                                        s = remove_ext((char *)js+t[i+1].start, '.', '/');\r
-                                       strcpy(map->MAPTILESPTK->imgname, s);\r
+                                       strcpy(map->tiles->imgname, s);\r
                                        //And move to vrs, probably\r
 //                                     bp = bitmapLoadPcx("data/ed.pcx");\r
-//                                     map->MAPTILESPTK->btdata = &bp;\r
-                                       //map->MAPTILESPTK->btdata = malloc(sizeof(bitmap_t));\r
-                                       map->MAPTILESPTK->rows = 1;\r
-                                       map->MAPTILESPTK->cols = 1;\r
+//                                     map->tiles->btdata = &bp;\r
+                                       //map->tiles->btdata = malloc(sizeof(bitmap_t));\r
+                                       map->tiles->rows = 1;\r
+                                       map->tiles->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->MAPTILESPTK->tileHeight = atoi(js + t[i+1].start);\r
+                                       map->tiles->tileHeight = atoi(js + t[i+1].start);\r
 #ifdef DEBUG_MAPVAR\r
-                                       printf("Tile Height: %d\n", map->MAPTILESPTK->tileHeight);\r
+                                       printf("Tile Height: %d\n", map->tiles->tileHeight);\r
 #endif\r
                                        i++;\r
                                }else if(jsoneq(js, &(t[i]), "tilewidth") == 0) {\r
-                                       map->MAPTILESPTK->tileWidth = atoi(js + t[i+1].start);\r
+                                       map->tiles->tileWidth = atoi(js + t[i+1].start);\r
 #ifdef DEBUG_MAPVAR\r
-                                       printf("Tile Width: %d\n", map->MAPTILESPTK->tileWidth);\r
+                                       printf("Tile Width: %d\n", map->tiles->tileWidth);\r
 #endif\r
                                        i++;\r
                                }\r