X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fmaptest.c;h=deef4c7c5ac6bda9d6d9a778b62034d299dc8cc9;hb=1f8ab84856824c246e1f66862a302eae41baf123;hp=d4375e4e22851873e43b5d21d57418c3c45174ad;hpb=99d92f75bf55b53d9153149607344f5e0a072000;p=16.git

diff --git a/src/maptest.c b/src/maptest.c
index d4375e4e..deef4c7c 100755
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -19,44 +19,79 @@
  * Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-//TODO: ADD MEMORY MANAGER! WWWW
-#include "src/lib/mapread.h"
+#include "src/lib/16_map.h"
 
 #define DUMP
-//#define DUMP_MAP
+#define DUMP_MAP
 
 void
 main(int argc, char *argv[])
 {
+	static global_game_variables_t gvar;
 	map_t map;
+#ifdef DUMP
+#ifdef DUMP_MAP
 	short i;
+#ifdef __NEWMAPTILEDATAVARS__
+	word k;
+#endif
+#endif
+#endif
 	char *fmt = "Memory available = %u\n";
 	char *fmt0 = "Largest Contiguous Block of Memory available = %u\n";
 
+	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(&map));
-	fprintf(stderr, "program always crashes for some reason....");
+	fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.camap.mapsegs)));
+	//fprintf(stderr, "program always crashes for some reason....\n");
 	getch();
 
-	loadmap("data/test.map", &map);
+	//loadmap("data/test.map", &map);
+	//newloadmap("data/test.map", &map);
+	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
-	for(i=0; i<(map.width*map.height); i++)
+	//if(map.width*map.height != 1200)
+#ifdef __NEWMAPTILEDATAVARS__
+	for(k=0;k<MAPLAYERS;k++)
 	{
-		fprintf(stdout, "%04d[%02d]", i, map.data[i]);
-		if(i && !(i%map.width)) fprintf(stdout, "\n");
+		printf("maplayer: %u\n", k);
+#endif
+		for(i=0; i<(map.width*map.height); i++)
+		{
+			//fprintf(stdout, "%04d[%02d]", i, map.data[i]);
+			fprintf(stdout, "%c", map.MAPDATAPTK[i]+44);
+			if(!((i+1)%map.width)){
+				//fprintf(stdout, "[%d]", i);
+				fprintf(stdout, "\n"); }
+		}
+		//fprintf(stdout, "\n");
+#ifdef __NEWMAPTILEDATAVARS__
+		getch();
 	}
-	fprintf(stdout, "\n");
+#endif
+	#else
+	//fprintf(stderr, "contents of the buffer\n[\n%s\n]\n", (gvar.ca.camap.mapsegs));
 	#endif
-	fprintf(stdout, "&main()=%Fp\n", *argv[0]);
+	/*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);
+	fprintf(stdout, "&map.data==%Fp\n", map.data);*/
 	#endif
-	fprintf(stdout, "okies~\n");
+	//fprintf(stdout, "okies~\n");
+	MM_FreePtr(&(gvar.ca.camap.mapsegs), &gvar);
+	PM_Shutdown(&gvar);
+	CA_Shutdown(&gvar);
+	MM_Shutdown(&gvar);
 }