X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fmaptest.c;h=7b53667c7d755a61073088bada70837bf6881e09;hb=256be2f6f35912701d3e3770e49e388f462a6acc;hp=696f9b7368cfc7339d65a2e72a7796af5603bb61;hpb=46ab351125c93564e17aacce420069f865188737;p=16.git

diff --git a/src/maptest.c b/src/maptest.c
index 696f9b73..7b53667c 100755
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -20,69 +20,72 @@
  *
  */
 #include "src/lib/16_map.h"
+#include <malloc.h>
 
 #define DUMP
-#define DUMP_MAP
+//#define DUMP_MAP
 
 void
 main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	map_t map;
+	static map_t map;
 #ifdef DUMP
 #ifdef DUMP_MAP
-	short i,k;
+	short i;
+	word k;
 #endif
 #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.mapsegs)));
+	//getch();
 
-	//loadmap("data/test.map", &map);
-	//newloadmap("data/test.map", &map);
 	CA_loadmap("data/test.map", &map, &gvar);
-	#ifdef DUMP
+#ifdef DUMP
 	fprintf(stdout, "map.width=	%d\n", map.width);
 	fprintf(stdout, "map.height=	%d\n", map.height);
-	#ifdef DUMP_MAP
+	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++)
 		{
 			//fprintf(stdout, "%04d[%02d]", i, map.data[i]);
-			fprintf(stdout, "%c", map.MAPDATAPTR[i]+44);
+			//fprintf(stdout, "%c", map.MAPDATAPTK[i]+44);
+			fprintf(stdout, "%c", map.layerdata[k].data[i]+44);
 			if(!((i+1)%map.width)){
 				//fprintf(stdout, "[%d]", i);
 				fprintf(stdout, "\n"); }
 		}
-		fprintf(stdout, "\n");
+		fprintf(stdout, "]\n");
 		getch();
 	}
-	#else
-	//fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.camap.mapsegs));
-	#endif
+#else
+	//fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.mapsegs));
+#endif
 	/*fprintf(stdout, "&main()=%Fp\n", *argv[0]);
 	fprintf(stdout, "&map==%Fp\n", &map);
 	fprintf(stdout, "&map.tiles==%Fp\n", map.tiles);
 	fprintf(stdout, "&map.width==%Fp\n", map.width);
 	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);
+#endif
+	//fprintf(stderr, "here comes dat boi!\n"); getch(); fprintf(stderr, "%s", datboi);
+	MM_FreePtr((memptr *)&(gvar.ca.mapsegs), &gvar);
 	PM_Shutdown(&gvar);
 	CA_Shutdown(&gvar);
 	MM_Shutdown(&gvar);