X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fexmmtest.c;h=ea73aa996358518a0b7b5e279202d17271ea8579;hb=adb425e17c32e33e71670dd69c909717f1d65acb;hp=1a4cbe6839edbf0d1be9f232d0dc8e16ee151e2f;hpb=23c4d02d9d36e5c5aa030fa5d1413d1558fc8af0;p=16.git

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 1a4cbe68..ea73aa99 100755
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -44,14 +44,20 @@
 //#define EXMMVERBOSE__
 //	#define PRINTBBDUMP
 #define BUFFDUMP
+
+#ifdef __BORLANDC__
+#define NOVID
+#endif
+#ifdef __WATCOMC__
 #define NOVID
+#endif
 
 
 #define KEYP IN_Shutdown(&gvar); printf("\n\npress any key to continue!\n"); getch(); IN_Startup(&gvar);
 
 #define BBUFNAME gvar.mm.bufferseg//bigbuffer
 //#define INITBBUF static memptr BBUFNAME;
-#define BBUFPTR	MEMPTR BBUFNAME
+#define BBUFPTR	MEMPTRCONV BBUFNAME
 
 #ifdef __BORLANDC__
 #define BBUF		(memptr *)BBUFPTR
@@ -63,9 +69,10 @@
 #endif
 
 ////////////////////////////////////////////////////////////////////////////
-//#ifdef __BORLANDC__
-void VL_Startup (global_game_variables_t *gvar){}
-void VL_Shutdown (global_game_variables_t *gvar){}
+//#ifdef NOVID
+#ifdef __BORLANDC__
+void VL_Startup (global_game_variables_t *gvar){ gvar=gvar; }
+void VL_Shutdown (global_game_variables_t *gvar){ gvar=gvar; }
 void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)
 {
 	printf("VGAmodeX dummy:\n	%Fp	%Fp	%Fp\n", &vq, &cmem, gv);
@@ -82,7 +89,7 @@ void	TL_VidInit(global_game_variables_t *gvar)
 {
 	gvar->video.old_mode = 3;
 }
-//#endif
+#endif
 
 //printf("*	%Fp\t", *BBUF);
 //printf("*	     %04x\t", *BBUF);
@@ -134,10 +141,6 @@ void
 main(int argc, char *argv[])
 {
 	byte w;
-								#ifndef NOVID
-	boolean			done;
-	ScanCode		scan;
-								#endif
 	static global_game_variables_t gvar;
 								#ifdef INITBBUF
 	INITBBUF
@@ -185,12 +188,10 @@ main(int argc, char *argv[])
 								#ifndef NOVID
 	Startup16(&gvar);
 	// save the palette
-								#ifdef __WATCOMC__
 	modexPalSave(&gvar.video.dpal); modexFadeOff(4, &gvar.video.dpal); //modexPalBlack();
-								#endif
 								#else //NOVID
-	//printf("main()=%Fp	start MM\n", *argv[0]);
-	MM_Startup(&gvar);
+	StartupCAMMPM(&gvar);
+/*	MM_Startup(&gvar);
 								#ifdef __16_PM__
 								#ifdef __DEBUG_PM__
 									if(dbg_debugpm>0)
@@ -202,9 +203,8 @@ main(int argc, char *argv[])
 									}
 								#endif //__DEBUG_PM__
 								#endif //__16_PM__
+	CA_Startup(&gvar);*/
 								#endif //elsed NOVID
-
-	CA_Startup(&gvar);
 								#ifdef PRINTBBDUMP
 								//0000
 PRINTBB; KEYP
@@ -258,10 +258,14 @@ PRINTBB; KEYP
 
 #ifdef __WATCOMC__
 #ifndef NOVID
-	VGAmodeX(1, 0, &gvar);
+	VGAmodeX(8, 0, &gvar);
 //	modexPalUpdate0(&gvar.video.palette);
 //	ShapeTest_(&gvar);
-
+	MM_ShowMemory(&gvar);
+#if 0
+	{
+	boolean			done;
+	ScanCode		scan;
 	for (done = false;!done;)
 	{
 		while (!(scan = gvar.in.inst->LastScan))
@@ -276,7 +280,7 @@ PRINTBB; KEYP
 //			break;
 //#ifdef __WATCOMC__
 			case sc_O:
-				modexPalUpdate0(&gvar.video.palette); modexpdump(&gvar.video.page);
+				VL_modexPalScramble(&gvar.video.palette); modexpdump(&gvar.video.page);
 			break;
 			case sc_P:
 				modexpdump(&gvar.video.page[0]);
@@ -291,10 +295,12 @@ PRINTBB; KEYP
 			break;
 		}
 	}
+}
+#endif
 	VGAmodeX(0, 0, &gvar);
 #endif
 #endif
-//	MM_ShowMemory(&gvar);
+	MM_ShowMemory(&gvar);
 	DebugMemory_(&gvar, 1);
 	MM_DumpData(&gvar);
 	MM_Report_(&gvar);
@@ -304,14 +310,15 @@ PRINTBB; KEYP
 								#ifndef NOVID
 	Shutdown16(&gvar);
 								#else //novid
-								#ifdef __16_PM__
+	ShutdownCAMMPM(&gvar);
+/*								#ifdef __16_PM__
 								#ifdef __DEBUG_PM__
 									if(dbg_debugpm>0)
 								#endif //__DEBUG_PM__
 	PM_Shutdown(&gvar);
 								#endif //__16_PM__
 	CA_Shutdown(&gvar);
-	MM_Shutdown(&gvar);
+	MM_Shutdown(&gvar);*/
 								#endif //NOVID
 	IN_Shutdown(&gvar);
 	printf("========================================\n");
@@ -371,6 +378,8 @@ PRINTBB; KEYP
 #endif
 	printf("\n");
 #endif
+//	printf("curr_mode=%u\n", gvar.video.curr_mode);
+//	VL_PrintmodexmemInfo(&gvar.video);
 	//printf("old_mode=%u	VL_Started=%u", gvar.video.old_mode, gvar.video.VL_Started);
 	//printf("based core left:			%lu\n", (dword)_basedcoreleft());
 	//printf("huge core left:			%lu\n", (dword)_hugecoreleft());