WWWWWWWWWWWWwwwwwwwwwwWWWWWWWwwwwWWwwWWwwWwwWww

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

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index d5744b9a2b344438ef96dcc8ddc37c7ac7f23543..3d97e863db93678025adcd2049e9c69f3c2877d5 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -148,7 +148,7 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
        return 0;\r
 }\r
 \r
-int loadmap(char *mn, map_t *map)\r
+int loadmap(char *mn, map_t *map, global_game_variables_t *gvar)\r
 {\r
        int r;\r
        static word incr=0;\r
@@ -250,8 +250,8 @@ again:
 \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
-       bitmap_t bp;\r
-       //char *s;\r
+       //bitmap_t bp;\r
+\r
        i = 0;\r
        while(i<count) {\r
                if(jsoneq(js, &(t[i]), "layers") == 0) {\r
@@ -260,25 +260,30 @@ 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
-                               printf("%d, %d\n", 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
                                if(jsoneq(js, &(t[i]), "data") == 0) {\r
-                                       #ifdef DEBUG_MAPVAR\r
-                                       printf("Layer %d data: [", k);\r
-                                       #endif\r
+#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
                                        for(j = 0; j < t[i+1].size; j++) {\r
                                                map->layerdata[k][j] = (byte)atoi(js + t[i+2+j].start);\r
-                                               #ifdef DEBUG_MAPVAR\r
-                                               printf("%d, ", map->layerdata[k][j]);\r
-                                               #endif\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
+#ifdef DEBUG_MAPDATA\r
+                                               //printf("[%d,%d]%d", k, j, map->layerdata[k][j]);\r
+                                               fprintf(stdout, "%c", map->data[j]+44);\r
+#endif\r
                                        }\r
                                        i += j + 2;\r
                                        k++;\r
-                                       #ifdef DEBUG_MAPVAR\r
-                                       puts("]");\r
-                                       #endif\r
-                               }\r
-                               else{\r
+#ifdef DEBUG_MAPDATA\r
+                                       puts("\n]");\r
+#endif\r
+                               }else{\r
                                        i++;\r
                                }\r
                        }\r
@@ -290,8 +295,11 @@ 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
-                                       //fix this to be far~\r
                                        map->layertile[k] = malloc(sizeof(tiles_t));\r
+                                       //Fix to load tileset specified.\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
@@ -300,10 +308,11 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
 #ifdef __DEBUG_MAP__\r
                                        dbg_maptext=false;\r
 #endif\r
-                                       //Fix to load tileset specified.\r
-                                       //And move to vrs, probably\r
-                                       //bp = bitmapLoadPcx("data/ed.pcx");\r
-                                       map->layertile[k]->btdata = &bp;\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
                                }\r
                                i++;\r
@@ -312,16 +321,16 @@ 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_MAPVAR\r
                        printf("Height: %d\n", map->height);\r
-                       #endif\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_MAPVAR\r
                        printf("Width: %d\n", map->width);\r
-                       #endif\r
+#endif\r
                        i++;\r
                }\r
                i++;\r
@@ -372,3 +381,40 @@ int newloadmap(char *mn, map_t *map) {
 \r
        return 0;\r
 }\r
+\r
+\r
+//======\r
+\r
+\r
+#define MAPBUFINLM (gvar->ca.camap.mapsegs)\r
+int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)\r
+{\r
+       jsmn_parser p;\r
+       jsmntok_t *tok = NULL;\r
+       size_t tokcount, file_s;\r
+\r
+       FILE *fh = fopen(mn, "r");\r
+       int status;\r
+\r
+       /* Prepare parser */\r
+       jsmn_init(&p);\r
+\r
+       file_s = filesize(fh);\r
+       CA_LoadFile(mn, &MAPBUFINLM, gvar);\r
+       tokcount = jsmn_parse(&p, MAPBUFINLM, file_s, NULL, 0);\r
+       tok = malloc(tokcount*sizeof(jsmntok_t));\r
+//     printf("Allocated %d tokens", tokcount);\r
+       jsmn_init(&p);\r
+       if((status = jsmn_parse(&p, MAPBUFINLM, file_s, tok, tokcount)) < 0)\r
+       {\r
+               printf("Error: %d\n", status);\r
+               return status;\r
+       }\r
+       else if(status != tokcount) { printf("Warning: used %d tok\n", status);}\r
+       extract_map(MAPBUFINLM, tok, tokcount, map);\r
+\r
+       free(tok);\r
+       fclose(fh);\r
+\r
+       return 0;\r
+}\r