too tired to continue

[16.git] / src / maptest.c

diff --git a/src/maptest.c b/src/maptest.c
index 4a413ca83f59c6b1f21300b11f2d41f6be81ee69..696f9b7368cfc7339d65a2e72a7796af5603bb61 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -29,9 +29,10 @@ main(int argc, char *argv[])
 {\r
        static global_game_variables_t gvar;\r
        map_t map;\r
-       static memptr   mapbuf;\r
+#ifdef DUMP\r
 #ifdef DUMP_MAP\r
-       short i;\r
+       short i,k;\r
+#endif\r
 #endif\r
        char *fmt = "Memory available = %u\n";\r
        char *fmt0 = "Largest Contiguous Block of Memory available = %u\n";\r
@@ -45,29 +46,33 @@ main(int argc, char *argv[])
 \r
        fprintf(stderr, fmt, _memavl());\r
        fprintf(stderr, fmt0, _memmax());\r
-       fprintf(stderr, "Size of map var = %u\n", _msize(&mapbuf));\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
 \r
-       loadmap("data/test.map", &map);\r
-       CA_LoadFile("data/test.map", &mapbuf, &gvar);\r
-       //map=(map_t *)mapbuf;\r
+       //loadmap("data/test.map", &map);\r
+       //newloadmap("data/test.map", &map);\r
+       CA_loadmap("data/test.map", &map, &gvar);\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
        //if(map.width*map.height != 1200)\r
-       for(i=0; i<(map.width*map.height); i++)\r
+       for(k=0;k<MAPLAYERS;k++)\r
        {\r
-               //fprintf(stdout, "%04d[%02d]", i, map.data[i]);\r
-               fprintf(stdout, "%c", map.data[i]+44);\r
-               if(!((i+1)%map.width)){\r
-                       //fprintf(stdout, "[%d]", i);\r
-                       fprintf(stdout, "\n"); }\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.MAPDATAPTR[i]+44);\r
+                       if(!((i+1)%map.width)){\r
+                               //fprintf(stdout, "[%d]", i);\r
+                               fprintf(stdout, "\n"); }\r
+               }\r
+               fprintf(stdout, "\n");\r
+               getch();\r
        }\r
-       fprintf(stdout, "\n");\r
        #else\r
-       fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", mapbuf);\r
+       //fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.camap.mapsegs));\r
        #endif\r
        /*fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
        fprintf(stdout, "&map==%Fp\n", &map);\r
@@ -77,7 +82,7 @@ main(int argc, char *argv[])
        fprintf(stdout, "&map.data==%Fp\n", map.data);*/\r
        #endif\r
        fprintf(stdout, "okies~\n");\r
-       MM_FreePtr(&mapbuf, &gvar);\r
+       MM_FreePtr(&(gvar.ca.camap.mapsegs), &gvar);\r
        PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar);\r