Merge remote-tracking branch 'upstream/master'

[16.git] / src / maptest.c

diff --git a/src/maptest.c b/src/maptest.c
index d4375e4e22851873e43b5d21d57418c3c45174ad..b77b5e55ff581c2f6bc53db4648ee33ff9a48271 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -20,10 +20,10 @@
  *\r
  */\r
 //TODO: ADD MEMORY MANAGER! WWWW\r
-#include "src/lib/mapread.h"\r
+#include "src/lib/16_map.h"\r
 \r
 #define DUMP\r
-//#define DUMP_MAP\r
+#define DUMP_MAP\r
 \r
 void\r
 main(int argc, char *argv[])\r
@@ -36,7 +36,7 @@ main(int argc, char *argv[])
        fprintf(stderr, fmt, _memavl());\r
        fprintf(stderr, fmt0, _memmax());\r
        fprintf(stderr, "Size of map var = %u\n", _msize(&map));\r
-       fprintf(stderr, "program always crashes for some reason....");\r
+       //fprintf(stderr, "program always crashes for some reason....\n");\r
        getch();\r
 \r
        loadmap("data/test.map", &map);\r
@@ -44,9 +44,10 @@ main(int argc, char *argv[])
        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
        {\r
-               fprintf(stdout, "%04d[%02d]", i, map.data[i]);\r
+               fprintf(stdout, "%04d[%02d]", i, map.data[0][i]);\r
                if(i && !(i%map.width)) fprintf(stdout, "\n");\r
        }\r
        fprintf(stdout, "\n");\r