X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fmaptest.c;h=96b4adb3bc9cbb8d5bddb0168ca5e537de0a140b;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=11097deb6911bb1f1cd6be7a199a7a455f47a97a;hpb=cccf74b8d5b618b293330755da222138dcf619cc;p=16.git

diff --git a/src/maptest.c b/src/maptest.c
index 11097deb..96b4adb3 100755
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -20,6 +20,7 @@
  *
  */
 #include "src/lib/16_map.h"
+#include <malloc.h>
 
 #define DUMP
 //#define DUMP_MAP
@@ -41,15 +42,13 @@ main(int argc, char *argv[])
 
 	MM_Startup(&gvar);
 	PM_Startup(&gvar);
-	//printf("pmstarted ok\n");
 	PM_CheckMainMem(&gvar);
 	PM_UnlockMainMem(&gvar);
 	CA_Startup(&gvar);
 
 	fprintf(stderr, fmt, _memavl());
 	fprintf(stderr, fmt0, _memmax());
-	fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.camap.mapsegs)));
-	//getch();
+	fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.MAPSEGPTR)));
 
 	CA_loadmap("data/test.map", &map, &gvar);
 #ifdef DUMP
@@ -57,8 +56,7 @@ main(int argc, char *argv[])
 	fprintf(stdout, "map.height=	%d\n", map.height);
 	getch();
 #ifdef DUMP_MAP
-	//if(map.width*map.height != 1200)
-	for(k=0;k<MAP_LAYERS;k++)
+	for(k=0;k<MAPPLANES;k++)
 	{
 		printf("maplayer: %u\n[\n", k);
 		for(i=0; i<(map.width*map.height); i++)
@@ -74,7 +72,7 @@ main(int argc, char *argv[])
 		getch();
 	}
 #else
-	//fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.camap.mapsegs));
+	fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.MAPSEGPTR));
 #endif
 	/*fprintf(stdout, "&main()=%Fp\n", *argv[0]);
 	fprintf(stdout, "&map==%Fp\n", &map);
@@ -84,7 +82,7 @@ main(int argc, char *argv[])
 	fprintf(stdout, "&map.data==%Fp\n", map.data);*/
 #endif
 	//fprintf(stderr, "here comes dat boi!\n"); getch(); fprintf(stderr, "%s", datboi);
-	MM_FreePtr(&(gvar.ca.camap.mapsegs), &gvar);
+	MM_FreePtr(MEMPTRCONV (gvar.ca.MAPSEGPTR), &gvar);
 	PM_Shutdown(&gvar);
 	CA_Shutdown(&gvar);
 	MM_Shutdown(&gvar);