[xcroll.exe needs testing on real hardware] it is working but not flexible 16_ca...

[16.git] / src / maptest.c

diff --git a/src/maptest.c b/src/maptest.c
index 8c1549ac6443f960bd5b96a50ad58d803635f1ed..33c5dcc7152a6e3d5e949734248388ecdd1c4908 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -20,9 +20,10 @@
  *\r
  */\r
 #include "src/lib/16_map.h"\r
+#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
@@ -37,31 +38,25 @@ main(int argc, char *argv[])
 #endif\r
        char *fmt = "Memory available = %u\n";\r
        char *fmt0 = "Largest Contiguous Block of Memory available = %u\n";\r
+       //byte *datboi = "oh shit waddup!\n";\r
 \r
        MM_Startup(&gvar);\r
        PM_Startup(&gvar);\r
-       //printf("pmstarted ok\n");\r
-       //PM_CheckMainMem(&gvar);\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.camap.mapsegs)));\r
-       //fprintf(stderr, "program always crashes for some reason....\n");\r
-       getch();\r
+       fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.MAPSEGPTR)));\r
 \r
-       //loadmap("data/test.map", &map);\r
-       //newloadmap("data/test.map", &map);\r
-//     CA_loadmap("data/test.map", &map, &gvar);\r
-       CA_loadmap("data/newtest.map", &map, &gvar);\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
        getch();\r
 #ifdef DUMP_MAP\r
-       //if(map.width*map.height != 1200)\r
-       for(k=0;k<MAPLAYERS;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
@@ -77,7 +72,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.MAPSEGPTR));\r
 #endif\r
        /*fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
        fprintf(stdout, "&map==%Fp\n", &map);\r
@@ -86,8 +81,8 @@ 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
-       MM_FreePtr(&(gvar.ca.camap.mapsegs), &gvar);\r
+       //fprintf(stderr, "here comes dat boi!\n"); getch(); fprintf(stderr, "%s", datboi);\r
+       MM_FreePtr(MEMPTRCONV (gvar.ca.MAPSEGPTR), &gvar);\r
        PM_Shutdown(&gvar);\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar);\r