X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fmaptest.c;h=33c5dcc7152a6e3d5e949734248388ecdd1c4908;hb=2fc6c650cc91ba3a4447630286d9aa4bb92bbfda;hp=ace55f254ee94e592893148c3ece5a54b11407b0;hpb=2d5a78ff21bb12a9b5f635d3e80845ed58d7ddcd;p=16.git

diff --git a/src/maptest.c b/src/maptest.c
index ace55f25..33c5dcc7 100755
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -20,62 +20,69 @@
  *
  */
 #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 memptr	mapbuf;
+	static map_t map;
+#ifdef DUMP
 #ifdef DUMP_MAP
 	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(&mapbuf));
-	//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);
-	CA_LoadFile("data/test.map", &mapbuf, &gvar);
-	//map=(map_t *)mapbuf;
-	#ifdef DUMP
+	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);
-	#ifdef DUMP_MAP
-	//if(map.width*map.height != 1200)
-	for(i=0; i<(map.width*map.height); i++)
+	getch();
+#ifdef DUMP_MAP
+	for(k=0;k<MAPPLANES;k++)
 	{
-		//fprintf(stdout, "%04d[%02d]", i, map.data[i]);
-		fprintf(stdout, "%c", map.data[i]+44);
-		if(!((i+1)%map.width)){ fprintf(stdout, "[%d]", i); fprintf(stdout, "\n"); }
+		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.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");
+		getch();
 	}
-	fprintf(stdout, "\n");
-	#else
-	fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", mapbuf);
-	#endif
+#else
+	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);
 	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(&mapbuf, &gvar);
+#endif
+	//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);