LAYERING WORKS NOW!

[16.git] / src / maptest.c

diff --git a/src/maptest.c b/src/maptest.c
index 2aa6bc3fce40682919076090f8ecb9c10d3241f0..8c1549ac6443f960bd5b96a50ad58d803635f1ed 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -28,14 +28,12 @@ void
 main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       map_t map;\r
+       static map_t map;\r
 #ifdef DUMP\r
 #ifdef DUMP_MAP\r
        short i;\r
-#ifdef __NEWMAPTILEDATAVARS__\r
        word k;\r
 #endif\r
-#endif\r
 #endif\r
        char *fmt = "Memory available = %u\n";\r
        char *fmt0 = "Largest Contiguous Block of Memory available = %u\n";\r
@@ -51,48 +49,43 @@ main(int argc, char *argv[])
        fprintf(stderr, fmt0, _memmax());\r
        fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.camap.mapsegs)));\r
        //fprintf(stderr, "program always crashes for some reason....\n");\r
-       //getch();\r
+       getch();\r
 \r
        //loadmap("data/test.map", &map);\r
        //newloadmap("data/test.map", &map);\r
-#ifndef __NEWMAPTILEDATAVARS__\r
-       CA_loadmap("data/test.map", &map, &gvar);\r
-#else\r
+//     CA_loadmap("data/test.map", &map, &gvar);\r
        CA_loadmap("data/newtest.map", &map, &gvar);\r
-#endif\r
-       #ifdef DUMP\r
+#ifdef DUMP\r
        fprintf(stdout, "map.width=     %d\n", map.width);\r
        fprintf(stdout, "map.height=    %d\n", map.height);\r
-       #ifdef DUMP_MAP\r
+       getch();\r
+#ifdef DUMP_MAP\r
        //if(map.width*map.height != 1200)\r
-#ifdef __NEWMAPTILEDATAVARS__\r
        for(k=0;k<MAPLAYERS;k++)\r
        {\r
                printf("maplayer: %u\n[\n", k);\r
-#endif\r
                for(i=0; i<(map.width*map.height); i++)\r
                {\r
                        //fprintf(stdout, "%04d[%02d]", i, map.data[i]);\r
-                       fprintf(stdout, "%c", map.MAPDATAPTK[i]+44);\r
+                       //fprintf(stdout, "%c", map.MAPDATAPTK[i]+44);\r
+                       fprintf(stdout, "%c", map.layerdata[k].data[i]+44);\r
                        if(!((i+1)%map.width)){\r
                                //fprintf(stdout, "[%d]", i);\r
                                fprintf(stdout, "\n"); }\r
                }\r
-               fprintf(stdout, "\n]\n");\r
-#ifdef __NEWMAPTILEDATAVARS__\r
-               //getch();\r
+               fprintf(stdout, "]\n");\r
+               getch();\r
        }\r
-#endif\r
-       #else\r
+#else\r
        //fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.camap.mapsegs));\r
-       #endif\r
+#endif\r
        /*fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
        fprintf(stdout, "&map==%Fp\n", &map);\r
        fprintf(stdout, "&map.tiles==%Fp\n", map.tiles);\r
        fprintf(stdout, "&map.width==%Fp\n", map.width);\r
        fprintf(stdout, "&map.height==%Fp\n", map.height);\r
        fprintf(stdout, "&map.data==%Fp\n", map.data);*/\r
-       #endif\r
+#endif\r
        //fprintf(stdout, "okies~\n");\r
        MM_FreePtr(&(gvar.ca.camap.mapsegs), &gvar);\r
        PM_Shutdown(&gvar);\r