LAYERING WORKS NOW!

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

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 37179ab76d120cb44ecc0952fe6bc3bdf9e2ea1a..f74f46caa505af888b76b1a4b860c0a03ce10e31 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -268,14 +268,15 @@ 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->MAPDATAPTK = malloc(sizeof(byte) * t[i+1].size);\r
-                                       //for backwards compatibility for rest of code\r
-//                                     map->data = map->MAPDATAPTK;\r
+                                       map->layerdata[k].data = malloc(sizeof(byte) * t[i+1].size);\r
+//                                     map->data = (map->layerdata[k].data); //for backwards compatibility for rest of code\r
                                        for(j = 0; j < t[i+1].size; j++) {\r
-                                               map->MAPDATAPTK[j] = (byte)atoi(js + t[i+2+j].start);\r
+                                               //map->layerdata[k][j] = (byte)atoi(js + t[i+2+j].start);\r
+                                               map->layerdata[k].data[j] = (byte)atoi(js + t[i+2+j].start);\r
 #ifdef DEBUG_MAPDATA\r
                                                //printf("[%d,%d]%d", k, j, map->MAPDATAPTK[j]);\r
-                                               fprintf(stdout, "%c", map->data[j]+44);\r
+                                               printf("%c",  map->MAPDATAPTK[j]+44);\r
+                                               //fprintf(stdout, "%c", map->data[j]+44);\r
 #endif\r
                                        }\r
                                        i += j + 2;\r
@@ -309,9 +310,15 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
                                        i++;\r
                                }else if(jsoneq(js, &(t[i]), "tileheight") == 0) {\r
                                        map->MAPTILESPTK->tileHeight = atoi(js + t[i+1].start);\r
+#ifdef DEBUG_MAPVAR\r
+                                       printf("Tile Height: %d\n", map->MAPTILESPTK->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
+#ifdef DEBUG_MAPVAR\r
+                                       printf("Tile Width: %d\n", map->MAPTILESPTK->tileWidth);\r
+#endif\r
                                        i++;\r
                                }\r
                                i++;\r