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 945aa95427f4946baf0fa8d875f573e5eababc58..5ca5c29a2b338c0381f93c71921afc8f93e08f31 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -47,6 +47,7 @@
 #define BUFFDUMP\r
 #define NOVID\r
 \r
+\r
 #define KEYP IN_Shutdown(&gvar); printf("\n\npress any key to continue!\n"); getch(); IN_Startup(&gvar);\r
 \r
 #define BBUFNAME bigbuffer//gvar.ca.tinf[0]\r
@@ -109,6 +110,8 @@ void segatesuto()
 }\r
 #endif\r
 \r
+\r
+\r
 void\r
 main(int argc, char *argv[])\r
 {\r
@@ -124,17 +127,12 @@ main(int argc, char *argv[])
 //#ifdef __WATCOMC__\r
 //     __segment sega;\r
 //#endif\r
-       //static byte bakapee[64];\r
-       char *bakapee1, *bakapee2;\r
+       char bakapee1[64],bakapee2[64];\r
        word baka;\r
 \r
 #ifdef __BORLANDC__\r
        argc=argc;\r
 #endif\r
-       //file name //\r
-       bakapee1 = malloc(24);\r
-       bakapee2 = malloc(24);\r
-       //file name //\r
 \r
 #ifdef __16_PM__\r
 #ifdef __DEBUG_PM__\r
@@ -148,18 +146,20 @@ main(int argc, char *argv[])
 #ifdef PRINTBBDUMP\r
 //0000PRINTBB; KEYP\r
 #endif\r
-       if(argv[1]){ bakapee1 = argv[1];\r
-       if(argv[2]) bakapee2 = argv[2]; }\r
+       if(argv[1]){ strcpy(bakapee1, argv[1]);//bakapee1[] = *argv[1];\r
+       if(argv[2]) strcpy(bakapee2, argv[2]); }//bakapee2[] = argv[2]; }\r
        else{\r
        //{ printf("filename!: "); scanf("%[^\n]", &bakapee); }\r
-               bakapee1 = "data/koishi~.pcx";\r
-               bakapee2 = "data/test.map";\r
+               strcpy(bakapee1, "data/koishi~.pcx"); //bakapee1 = "data/koishi~.pcx";\r
+               strcpy(bakapee2, "data/test.map"); //bakapee2 = "data/test.map";\r
        }\r
 #ifndef NOVID\r
        Startup16(&gvar);\r
 \r
        // save the palette\r
+#ifdef __WATCOMC__\r
        modexPalSave(&gvar.video.dpal); modexFadeOff(4, &gvar.video.dpal); //modexPalBlack();\r
+#endif\r
 #else  //NOVID\r
        //printf("main()=%Fp    start MM\n", *argv[0]);\r
        MM_Startup(&gvar); //printf("ok\n");\r
@@ -238,11 +238,10 @@ PRINTBB; KEYP
 #endif\r
 #endif //filereadload\r
 \r
-\r
 #ifdef __WATCOMC__\r
 #ifndef NOVID\r
        VGAmodeX(1, 0, &gvar);\r
-       modexPalUpdate0(&gvar.video.palette);\r
+//     modexPalUpdate0(&gvar.video.palette);\r
 //     ShapeTest_(&gvar);\r
 \r
        for (done = false;!done;)\r
@@ -254,9 +253,10 @@ PRINTBB; KEYP
                IN_ClearKey(scan);\r
                switch (scan)\r
                {\r
-                       case sc_Space:\r
-                               MM_ShowMemoryVidVer(&gvar);\r
-                       break;\r
+//                     case sc_Space:\r
+//                             MM_ShowMemory(&gvar);\r
+//                     break;\r
+//#ifdef __WATCOMC__\r
                        case sc_O:\r
                                modexPalUpdate0(&gvar.video.palette); modexpdump(&gvar.video.page);\r
                        break;\r
@@ -266,15 +266,17 @@ PRINTBB; KEYP
                        case sc_V:\r
                                VL_PatternDraw(&gvar.video, 0, 1, 1);\r
                        break;\r
+//#endif\r
                        default:\r
-                       //case sc_Escape:\r
+                       case sc_Escape:\r
                                done = true;\r
                        break;\r
                }\r
        }\r
+       VGAmodeX(0, 0, &gvar);\r
 #endif\r
 #endif\r
-\r
+//     MM_ShowMemory(&gvar);\r
        DebugMemory_(&gvar, 1);\r
        MM_DumpData(&gvar);\r
        MM_Report_(&gvar);\r
@@ -294,7 +296,6 @@ PRINTBB; KEYP
        MM_Shutdown(&gvar);\r
 #endif //NOVID\r
        IN_Shutdown(&gvar);\r
-       free(bakapee1); free(bakapee2);\r
        printf("========================================\n");\r
        printf("near=   %Fp ", gvar.mm.nearheap);\r
        printf("far=    %Fp", gvar.mm.farheap);\r
@@ -348,7 +349,7 @@ PRINTBB; KEYP
 #endif\r
        printf("\n");\r
 #endif\r
-       printf("old_mode=%u     VL_Started=%u", gvar.video.old_mode, gvar.video.VL_Started);\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
 }\r