X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fmaptest.c;h=96b4adb3bc9cbb8d5bddb0168ca5e537de0a140b;hb=1aeca2e3583a583d35c0f3c5877fc7c607091c3b;hp=8c1549ac6443f960bd5b96a50ad58d803635f1ed;hpb=9f7ffee2115e5b995c5470117e426d2c89b58979;p=16.git

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