16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / exmmtest.c

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 010bb6eacf7c302eb515600c87a6449369d5da55..ea73aa996358518a0b7b5e279202d17271ea8579 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -49,7 +49,7 @@
 #define NOVID\r
 #endif\r
 #ifdef __WATCOMC__\r
-//#define NOVID\r
+#define NOVID\r
 #endif\r
 \r
 \r
@@ -57,7 +57,7 @@
 \r
 #define BBUFNAME gvar.mm.bufferseg//bigbuffer\r
 //#define INITBBUF static memptr BBUFNAME;\r
-#define BBUFPTR        MEMPTR BBUFNAME\r
+#define BBUFPTR        MEMPTRCONV BBUFNAME\r
 \r
 #ifdef __BORLANDC__\r
 #define BBUF           (memptr *)BBUFPTR\r
@@ -69,7 +69,8 @@
 #endif\r
 \r
 ////////////////////////////////////////////////////////////////////////////\r
-#ifdef NOVID\r
+//#ifdef NOVID\r
+#ifdef __BORLANDC__\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
@@ -140,10 +141,6 @@ void
 main(int argc, char *argv[])\r
 {\r
        byte w;\r
-                                                               #ifndef NOVID\r
-       boolean                 done;\r
-       ScanCode                scan;\r
-                                                               #endif\r
        static global_game_variables_t gvar;\r
                                                                #ifdef INITBBUF\r
        INITBBUF\r
@@ -193,8 +190,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
@@ -206,9 +203,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
@@ -265,7 +261,11 @@ PRINTBB; KEYP
        VGAmodeX(8, 0, &gvar);\r
 //     modexPalUpdate0(&gvar.video.palette);\r
 //     ShapeTest_(&gvar);\r
-\r
+       MM_ShowMemory(&gvar);\r
+#if 0\r
+       {\r
+       boolean                 done;\r
+       ScanCode                scan;\r
        for (done = false;!done;)\r
        {\r
                while (!(scan = gvar.in.inst->LastScan))\r
@@ -275,9 +275,9 @@ PRINTBB; KEYP
                IN_ClearKey(scan);\r
                switch (scan)\r
                {\r
-                       case sc_Space:\r
-                               MM_ShowMemory(&gvar);\r
-                       break;\r
+//                     case sc_Space:\r
+//                             MM_ShowMemory(&gvar);\r
+//                     break;\r
 //#ifdef __WATCOMC__\r
                        case sc_O:\r
                                VL_modexPalScramble(&gvar.video.palette); modexpdump(&gvar.video.page);\r
@@ -295,6 +295,8 @@ PRINTBB; KEYP
                        break;\r
                }\r
        }\r
+}\r
+#endif\r
        VGAmodeX(0, 0, &gvar);\r
 #endif\r
 #endif\r
@@ -308,14 +310,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