-- reverted to before layer vars

[16.git] / src / maptest.c

diff --git a/src/maptest.c b/src/maptest.c
index deef4c7c5ac6bda9d6d9a778b62034d299dc8cc9..c73ea3dd403f3f32c22c940f4ab902dea676637d 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -32,9 +32,6 @@ main(int argc, char *argv[])
 #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
@@ -61,24 +58,15 @@ main(int argc, char *argv[])
        fprintf(stdout, "map.height=    %d\n", map.height);\r
        #ifdef DUMP_MAP\r
        //if(map.width*map.height != 1200)\r
-#ifdef __NEWMAPTILEDATAVARS__\r
-       for(k=0;k<MAPLAYERS;k++)\r
+       for(i=0; i<(map.width*map.height); i++)\r
        {\r
-               printf("maplayer: %u\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
-                       if(!((i+1)%map.width)){\r
-                               //fprintf(stdout, "[%d]", i);\r
-                               fprintf(stdout, "\n"); }\r
-               }\r
-               //fprintf(stdout, "\n");\r
-#ifdef __NEWMAPTILEDATAVARS__\r
-               getch();\r
+               //fprintf(stdout, "%04d[%02d]", i, map.data[i]);\r
+               fprintf(stdout, "%c", map.layerdata[0][i]+44);\r
+               if(!((i+1)%map.width)){\r
+                       //fprintf(stdout, "[%d]", i);\r
+                       fprintf(stdout, "\n"); }\r
        }\r
-#endif\r
+       fprintf(stdout, "\n");\r
        #else\r
        //fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.camap.mapsegs));\r
        #endif\r
@@ -89,7 +77,7 @@ main(int argc, char *argv[])
        fprintf(stdout, "&map.height==%Fp\n", map.height);\r
        fprintf(stdout, "&map.data==%Fp\n", map.data);*/\r
        #endif\r
-       //fprintf(stdout, "okies~\n");\r
+       fprintf(stdout, "okies~\n");\r
        MM_FreePtr(&(gvar.ca.camap.mapsegs), &gvar);\r
        PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r