16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / maptest.c

diff --git a/src/maptest.c b/src/maptest.c
index 11097deb6911bb1f1cd6be7a199a7a455f47a97a..7b53667c7d755a61073088bada70837bf6881e09 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -20,6 +20,7 @@
  *\r
  */\r
 #include "src/lib/16_map.h"\r
+#include <malloc.h>\r
 \r
 #define DUMP\r
 //#define DUMP_MAP\r
@@ -48,7 +49,7 @@ 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(&(gvar.ca.camap.mapsegs)));\r
+       fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.mapsegs)));\r
        //getch();\r
 \r
        CA_loadmap("data/test.map", &map, &gvar);\r
@@ -58,7 +59,7 @@ main(int argc, char *argv[])
        getch();\r
 #ifdef DUMP_MAP\r
        //if(map.width*map.height != 1200)\r
-       for(k=0;k<MAP_LAYERS;k++)\r
+       for(k=0;k<MAPPLANES;k++)\r
        {\r
                printf("maplayer: %u\n[\n", k);\r
                for(i=0; i<(map.width*map.height); i++)\r
@@ -74,7 +75,7 @@ main(int argc, char *argv[])
                getch();\r
        }\r
 #else\r
-       //fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.camap.mapsegs));\r
+       //fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.mapsegs));\r
 #endif\r
        /*fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
        fprintf(stdout, "&map==%Fp\n", &map);\r
@@ -84,7 +85,7 @@ main(int argc, char *argv[])
        fprintf(stdout, "&map.data==%Fp\n", map.data);*/\r
 #endif\r
        //fprintf(stderr, "here comes dat boi!\n"); getch(); fprintf(stderr, "%s", datboi);\r
-       MM_FreePtr(&(gvar.ca.camap.mapsegs), &gvar);\r
+       MM_FreePtr((memptr *)&(gvar.ca.mapsegs), &gvar);\r
        PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar);\r