p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / src / exmmtest.c

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 9fb1730b07e5b4ef5a927f9b6e813064f9cc3c1c..d668c2db7cdbffe4d7c96343ae063ee8f767c1c9 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -44,11 +44,12 @@
 //#define EXMMVERBOSE__\r
 //     #define PRINTBBDUMP\r
 #define BUFFDUMP\r
+\r
 #ifdef __BORLANDC__\r
 #define NOVID\r
 #endif\r
 #ifdef __WATCOMC__\r
-#define NOVID\r
+//#define NOVID\r
 #endif\r
 \r
 \r
@@ -69,8 +70,8 @@
 \r
 ////////////////////////////////////////////////////////////////////////////\r
 #ifdef NOVID\r
-//void VL_Startup (global_game_variables_t *gvar){}\r
-void VL_Shutdown (global_game_variables_t *gvar){}\r
+void VL_Startup (global_game_variables_t *gvar){ gvar=gvar; }\r
+void VL_Shutdown (global_game_variables_t *gvar){ gvar=gvar; }\r
 void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)\r
 {\r
        printf("VGAmodeX dummy:\n       %Fp     %Fp     %Fp\n", &vq, &cmem, gv);\r
@@ -192,8 +193,8 @@ main(int argc, char *argv[])
        // save the palette\r
        modexPalSave(&gvar.video.dpal); modexFadeOff(4, &gvar.video.dpal); //modexPalBlack();\r
                                                                #else //NOVID\r
-       //printf("main()=%Fp    start MM\n", *argv[0]);\r
-       MM_Startup(&gvar);\r
+       StartupCAMMPM(&gvar);\r
+/*     MM_Startup(&gvar);\r
                                                                #ifdef __16_PM__\r
                                                                #ifdef __DEBUG_PM__\r
                                                                        if(dbg_debugpm>0)\r
@@ -205,9 +206,8 @@ main(int argc, char *argv[])
                                                                        }\r
                                                                #endif //__DEBUG_PM__\r
                                                                #endif //__16_PM__\r
+       CA_Startup(&gvar);*/\r
                                                                #endif //elsed NOVID\r
-\r
-       CA_Startup(&gvar);\r
                                                                #ifdef PRINTBBDUMP\r
                                                                //0000\r
 PRINTBB; KEYP\r
@@ -261,7 +261,7 @@ PRINTBB; KEYP
 \r
 #ifdef __WATCOMC__\r
 #ifndef NOVID\r
-       VGAmodeX(1, 0, &gvar);\r
+       VGAmodeX(8, 0, &gvar);\r
 //     modexPalUpdate0(&gvar.video.palette);\r
 //     ShapeTest_(&gvar);\r
 \r
@@ -297,7 +297,7 @@ PRINTBB; KEYP
        VGAmodeX(0, 0, &gvar);\r
 #endif\r
 #endif\r
-//     MM_ShowMemory(&gvar);\r
+       MM_ShowMemory(&gvar);\r
        DebugMemory_(&gvar, 1);\r
        MM_DumpData(&gvar);\r
        MM_Report_(&gvar);\r
@@ -307,14 +307,15 @@ PRINTBB; KEYP
                                                                #ifndef NOVID\r
        Shutdown16(&gvar);\r
                                                                #else //novid\r
-                                                               #ifdef __16_PM__\r
+       ShutdownCAMMPM(&gvar);\r
+/*                                                             #ifdef __16_PM__\r
                                                                #ifdef __DEBUG_PM__\r
                                                                        if(dbg_debugpm>0)\r
                                                                #endif //__DEBUG_PM__\r
        PM_Shutdown(&gvar);\r
                                                                #endif //__16_PM__\r
        CA_Shutdown(&gvar);\r
-       MM_Shutdown(&gvar);\r
+       MM_Shutdown(&gvar);*/\r
                                                                #endif //NOVID\r
        IN_Shutdown(&gvar);\r
        printf("========================================\n");\r
@@ -374,6 +375,8 @@ PRINTBB; KEYP
 #endif\r
        printf("\n");\r
 #endif\r
+//     printf("curr_mode=%u\n", gvar.video.curr_mode);\r
+//     VL_PrintmodexmemInfo(&gvar.video);\r
        //printf("old_mode=%u   VL_Started=%u", gvar.video.old_mode, gvar.video.VL_Started);\r
        //printf("based core left:                      %lu\n", (dword)_basedcoreleft());\r
        //printf("huge core left:                       %lu\n", (dword)_hugecoreleft());\r