X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fexmmtest.c;h=26bfc9648819924e7850f51464be8f17f5250438;hb=6c83ae86cd14e4a6ce8db04cad177169e7cdad3c;hp=3da6f44e8d49d8765d59ba05ec53d511350b2fba;hpb=7b06bf5a3bc4142d3b2494ce9b2ca21ea63283d2;p=16.git

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 3da6f44e..26bfc964 100755
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -23,11 +23,11 @@
 	exmm test
 */
 #include "src/lib/16_head.h"
+#include "src/lib/16_tail.h"
 #include "src/lib/16_pm.h"
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 #include "src/lib/16_hc.h"
-#include "src/lib/16_lib.h"
 //#include "src/lib/modex16.h"
 #pragma hdrstop
 
@@ -62,12 +62,13 @@ void segatesuto()
 //	getch();
 }
 #endif
-global_game_variables_t gvar;
+//static global_game_variables_t gvar;
+
 void
 main(int argc, char *argv[])
 {
 	byte w=1;
-	//static global_game_variables_t gvar;
+	static global_game_variables_t gvar;
 #ifdef __WATCOMC__
 	__segment sega;
 #endif
@@ -86,7 +87,7 @@ main(int argc, char *argv[])
 	//file name //
 
 	gvar.mm.mmstarted=0;
-	debugpm=1;	//debug pm
+	dbg_debugpm=1;	//debug pm
 
 	//PRINTBB
 	if(argv[1]){ bakapee1 = argv[1];
@@ -96,19 +97,21 @@ main(int argc, char *argv[])
 		bakapee1 = "data/koishi~.pcx";
 		bakapee2 = "data/test.map";
 	}
-	printf("main()=%Fp	start MM\n", *argv[0]);
+	//printf("main()=%Fp	start MM\n", *argv[0]);
 	MM_Startup(&gvar);
-	printf("ok\n");
-	if(debugpm>0)
+	//printf("ok\n");
+//#ifdef __WATCOMC__
+	if(dbg_debugpm>0)
 	{
 		PM_Startup(&gvar);
-		printf("pmstarted ok\n");
+		//printf("pmstarted ok\n");
 		//PM_CheckMainMem(&gvar);
 		PM_UnlockMainMem(&gvar);
 	}
+//#endif
 	CA_Startup(&gvar);
 //	printf("		done!\n");
-	PRINTBB;
+	//0000PRINTBB;
 //	printf("press any key to continue!\n");
 //	getch();
 #ifdef FILEREAD
@@ -139,10 +142,7 @@ for(w=0;w<2;w++)
 	//printf("medium blue = non purgable\n");
 	//printf("red = locked\n");
 	printf("press any key to continue!\n");
-	getch();
-	MM_ShowMemory(&gvar);
-	MM_DumpData(&gvar);
-	MM_Report_(&gvar);
+	DebugMemory_(&gvar, 1);
 	if(baka) printf("\nyay!\n");
 	else printf("\npoo!\n");
 	printf("press any key to continue!\n");
@@ -150,11 +150,16 @@ for(w=0;w<2;w++)
 #ifdef FILEREAD
 }
 #endif
-	printf("bakapee1=%s\n", bakapee1);
-	printf("bakapee2=%s\n", bakapee2);
+	DebugMemory_(&gvar, 1);
+	MM_DumpData(&gvar);
+	MM_Report_(&gvar);
+	//printf("bakapee1=%s\n", bakapee1);
+	//printf("bakapee2=%s\n", bakapee2);
 	MM_FreePtr(&bigbuffer, &gvar);
-	if(debugpm>0)
+//#ifdef __WATCOMC__
+	if(dbg_debugpm>0)
 		PM_Shutdown(&gvar);
+//#endif
 	CA_Shutdown(&gvar);
 	MM_Shutdown(&gvar);
 	free(bakapee1); free(bakapee2);