xcroll.exe needs through testing on real hardware\!\!\!\! ass\! 16_ca needs huge...

[16.git] / src / maptest.c

diff --git a/src/maptest.c b/src/maptest.c
index fd966ffffe498af5725da55c342643606b56440e..7b53667c7d755a61073088bada70837bf6881e09 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -23,7 +23,7 @@
 #include <malloc.h>\r
 \r
 #define DUMP\r
-#define DUMP_MAP\r
+//#define DUMP_MAP\r
 \r
 void\r
 main(int argc, char *argv[])\r
@@ -42,13 +42,15 @@ main(int argc, char *argv[])
 \r
        MM_Startup(&gvar);\r
        PM_Startup(&gvar);\r
+       //printf("pmstarted ok\n");\r
        PM_CheckMainMem(&gvar);\r
        PM_UnlockMainMem(&gvar);\r
        CA_Startup(&gvar);\r
 \r
        fprintf(stderr, fmt, _memavl());\r
        fprintf(stderr, fmt0, _memmax());\r
-       fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.MAPSEGPTR)));\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
 #ifdef DUMP\r
@@ -56,6 +58,7 @@ main(int argc, char *argv[])
        fprintf(stdout, "map.height=    %d\n", map.height);\r
        getch();\r
 #ifdef DUMP_MAP\r
+       //if(map.width*map.height != 1200)\r
        for(k=0;k<MAPPLANES;k++)\r
        {\r
                printf("maplayer: %u\n[\n", k);\r
@@ -72,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.MAPSEGPTR));\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
@@ -82,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(MEMPTRCONV (gvar.ca.MAPSEGPTR), &gvar);\r
+       MM_FreePtr((memptr *)&(gvar.ca.mapsegs), &gvar);\r
        PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar);\r