too tired to continue

[16.git] / src / maptest.c

diff --git a/src/maptest.c b/src/maptest.c
index 330162499e831f6b52dddf9faa37f87a8766e426..696f9b7368cfc7339d65a2e72a7796af5603bb61 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -19,7 +19,6 @@
  * Fifth Floor, Boston, MA 02110-1301 USA.\r
  *\r
  */\r
-//TODO: ADD MEMORY MANAGER! WWWW\r
 #include "src/lib/16_map.h"\r
 \r
 #define DUMP\r
@@ -28,36 +27,63 @@
 void\r
 main(int argc, char *argv[])\r
 {\r
+       static global_game_variables_t gvar;\r
        map_t map;\r
-       short i;\r
+#ifdef DUMP\r
+#ifdef DUMP_MAP\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
 \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(&map));\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
+       //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) exit(-3);\r
-       for(i=0; i<(map.width*map.height); i++)\r
+       //if(map.width*map.height != 1200)\r
+       for(k=0;k<MAPLAYERS;k++)\r
        {\r
-               fprintf(stdout, "%04d[%02d]", i, map.data[i]);\r
-               if(i && !(i%map.width)) 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", (gvar.ca.camap.mapsegs));\r
        #endif\r
-       fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
+       /*fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
        fprintf(stdout, "&map==%Fp\n", &map);\r
        fprintf(stdout, "&map.tiles==%Fp\n", map.tiles);\r
        fprintf(stdout, "&map.width==%Fp\n", map.width);\r
        fprintf(stdout, "&map.height==%Fp\n", map.height);\r
-       fprintf(stdout, "&map.data==%Fp\n", map.data);\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
+       PM_Shutdown(&gvar);\r
+       CA_Shutdown(&gvar);\r
+       MM_Shutdown(&gvar);\r
 }\r