cannot work on this much more i gotta do school project and final

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

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 931afe435553116819dcd7682dc26ba1cfaf992f..2616778109b6b2559e5ff25271e6c7cd049cf225 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -46,23 +46,20 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
                        inner_end = t[i].end;\r
                        k = 0;\r
                        while(t[i].start < inner_end) {\r
-#ifdef DEBUG_DUMPVARS\r
-                               printf("t[%d].start=%d, %d\n", i, t[i].start, inner_end);\r
-#endif\r
+//#define DEBUG_DUMPVARS\r
+//#ifdef DEBUG_DUMPVARS\r
+//                             printf("t[%d].start=%d, %d\n", i, t[i].start, inner_end);\r
+//#endif\r
                                if(!objlay){\r
                                if(jsoneq(js, &(t[i]), "data") == 0) {\r
 #ifdef DEBUG_MAPDATA\r
                                        printf("Layer %d data: (size is %d)[\n", k, t[i+1].size);\r
 #endif\r
                                        map->layerdata[k].data = malloc(sizeof(byte) * t[i+1].size);//TODO: USE MM_ CA_ AND PM_\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->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
-                                               printf("%c",  map->MAPDATAPTK[j]+44);\r
-                                               //fprintf(stdout, "%c", map->data[j]+44);\r
+                                               printf("%c",  map->layerdata[k].data[j]+44);\r
 #endif\r
                                        }\r
                                        i += j + 2;\r
@@ -70,13 +67,13 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
                                        puts("\n]");\r
 #endif\r
                                }else if(jsoneq(js, &(t[i]), "name") == 0) {\r
-#ifdef DEBUG_MAPDATA\r
+#ifdef DEBUG_MAPVARS\r
                                        printf("Layer %d's name: (size is %d)[\n", k, MAPLNAMESIZE);\r
 #endif\r
-                                       map->layerdata[k].layername = malloc(sizeof(byte) * MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_\r
-                                       strncpy(map->layerdata[k].layername, js+t[i+1].start, MAPLNAMESIZE);\r
-                                       if(map->layerdata[k].layername[MAPLNAMESIZE]!=0) map->layerdata[k].layername[MAPLNAMESIZE]='\0';\r
-                                       if(strstr(map->layerdata[k].layername, "ob")) objlay=1;\r
+                                       //map->layerdata[k].layername = malloc(sizeof(byte) * MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_\r
+                                       strncpy(&(map->layerdata[k].layername), js+t[i+1].start, MAPLNAMESIZE);\r
+                                       if((map->layerdata[k].layername[MAPLNAMESIZE])!=0) map->layerdata[k].layername[MAPLNAMESIZE]='\0';\r
+                                       if(strstr(&map->layerdata[k].layername, "ob")) objlay=1;\r
 #ifdef DEBUG_MAPDATA\r
                                        printf("%s", map->layerdata[k].layername);\r
                                        printf("\n]\n");\r
@@ -84,24 +81,33 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
                                        k++;\r
                                }\r
                                }else{ //objlay\r
-                               if(jsoneq(js, &(t[i]), "objects") == 0) {\r
-#ifdef DEBUG_MAPDATA\r
-                                       printf("objects detected\n");\r
+                                       if(jsoneq(js, &(t[i]), "objects") == 0) {\r
+#ifdef DEBUG_OBVARS\r
+                                               printf("objects detected\n");\r
 #endif\r
-//                                     map->layerdata[k].layername = mAlloc(sizeof(byte) * MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_\r
-//                                     strncpy(map->layerdata[k].layername, js+t[i+1].start, MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_\r
-//                                     if(map->layerdata[k].layername[MAPLNAMESIZE]!=0) map->layerdata[k].layername[MAPLNAMESIZE]='\0';\r
-                               }else if(jsoneq(js, &(t[i]), "name") == 0) {\r
-#ifdef DEBUG_MAPDATA\r
-                                       printf("Object %d's name: (size is %d)[\n", k, MAPLNAMESIZE);\r
-                                       printf("'%.*s'", t[i+1].end - t[i+1].start, js+t[i+1].start);\r
-                                       printf("\n]\n");\r
+#ifdef DEBUG_OBVARS\r
+\r
 #endif\r
+//                                             map->layerdata[k].layername = mAlloc(sizeof(byte) * MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_\r
+//                                             strncpy(map->layerdata[k].layername, js+t[i+1].start, MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_\r
+//                                             if(map->layerdata[k].layername[MAPLNAMESIZE]!=0) map->layerdata[k].layername[MAPLNAMESIZE]='\0';\r
+                                       }else if(jsoneq(js, &(t[i]), "name") == 0) {\r
+#ifdef DEBUG_OBVARS\r
+                                               printf("Object %d's name: ", k);//, MAPLNAMESIZE\r
+                                               printf("'%.*s'\n", t[i+1].end - t[i+1].start, js+t[i+1].start);\r
+#endif\r
+                                       }else if(jsoneq(js, &(t[i]), "properties") == 0) {\r
+#ifdef DEBUG_OBVARS\r
+                                               printf("        properties: %.*s\n", t[i+1].end - t[i+1].start, js+t[i+1].start);\r
+#endif\r
+                                       }else if(jsoneq(js, &(t[i]), "walkable") == 0) {\r
+                                                       printf("                walkable: %d\n", atoi(js + t[i+1].start));\r
                                        }\r
-                               }\r
-                               i++;\r
-                       }\r
-               }\r
+\r
+                               }//end objlay\r
+                               i++;//next token\r
+                       }//tokens\r
+               }//layers\r
 \r
 \r
                if(jsoneq(js, &(t[i]), "tilesets") == 0) {\r
@@ -124,13 +130,13 @@ 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->tiles->tileHeight = atoi(js + t[i+1].start);\r
-#ifdef DEBUG_MAPVAR\r
+#ifdef DEBUG_MAPVARS\r
                                        printf("Tile Height: %d\n", map->tiles->tileHeight);\r
 #endif\r
                                        i++;\r
                                }else if(jsoneq(js, &(t[i]), "tilewidth") == 0) {\r
                                        map->tiles->tileWidth = atoi(js + t[i+1].start);\r
-#ifdef DEBUG_MAPVAR\r
+#ifdef DEBUG_MAPVARS\r
                                        printf("Tile Width: %d\n", map->tiles->tileWidth);\r
 #endif\r
                                        i++;\r
@@ -142,14 +148,14 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
 \r
                if (jsoneq(js, &(t[i]), "height") == 0 && indent<=1) {\r
                        map->height = atoi(js + t[i+1].start);\r
-#ifdef DEBUG_MAPVAR\r
+#ifdef DEBUG_MAPVARS\r
                        printf("Height: %d\n", map->height);\r
 #endif\r
                        i++;\r
                }\r
                else if(jsoneq(js, &(t[i]), "width") == 0 && indent<=1) {\r
                        map->width = atoi(js + t[i+1].start);\r
-#ifdef DEBUG_MAPVAR\r
+#ifdef DEBUG_MAPVARS\r
                        printf("Width: %d\n", map->width);\r
 #endif\r
                        i++;\r