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 d9af340172d1889a4ad3127802023989f92ad933..056e24faf98fa6b9bd3640ffe3fbbaf993cff19b 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -69,7 +69,7 @@
 #endif\r
 \r
 ////////////////////////////////////////////////////////////////////////////\r
-#ifdef __BORLANDC__\r
+#ifdef NOVID\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
@@ -77,17 +77,31 @@ void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)
        printf("VGAmodeX dummy:\n       %Fp     %Fp     %Fp\n", &vq, &cmem, gv);\r
 }\r
 \r
-word modexPalOverscan(word col)\r
+word\r
+VL_modexPalOverscan(byte *p, word col)\r
 {\r
+       int i;\r
        //modexWaitBorder();\r
+//     vga_wait_for_vsync();\r
        outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */\r
-       outp(PAL_DATA_REG, col);\r
+       for(i=col; i<(3+col); i++)\r
+       {\r
+               outp(PAL_DATA_REG, p[i]);\r
+       }\r
+//     modexPalSave(p);\r
        return col;\r
 }\r
 void   TL_VidInit(global_game_variables_t *gvar)\r
 {\r
        gvar->video.old_mode = 3;\r
 }\r
+\r
+#ifdef __WATCOMC__\r
+void VL_ShowPage(page_t *page, boolean vsync, boolean sr){}\r
+void modexClearRegion(page_t *page, int x, int y, int w, int h, byte color){}\r
+void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word color, word bgcolor, boolean vidsw, const byte *str){ printf("%s\n", str); }\r
+void modexpdump(nibble pagenum, global_game_variables_t *gvar){}\r
+#endif\r
 #endif\r
 \r
 //printf("*    %Fp\t", *BBUF);\r
@@ -179,6 +193,10 @@ main(int argc, char *argv[])
 \r
        printf("bakapee1[%s]\n", bakapee1);\r
        printf("bakapee2[%s]\n", bakapee2);\r
+                                                               #ifdef EXMMVERBOSE__\r
+       printf("coreleft():             %u\n", coreleft());\r
+       printf("farcoreleft():          %ld\n", farcoreleft());\r
+                                                               #endif\r
        KEYP\r
 \r
                                                                #ifndef NOVID\r
@@ -242,10 +260,10 @@ PRINTBB; KEYP
 \r
                                                        #ifdef SCROLLLOAD\r
 //                                                     #else           //scrollload\r
-       CA_loadmap(bakapee2, &gvar.map, &gvar);\r
+//     CA_loadmap(bakapee2, &gvar.map, &gvar); //BREAKS!\r
 //     newloadmap(bakapee2, &gvar.map);\r
        VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
-       HC_heapdump(&gvar);\r
+//     HC_heapdump(&gvar);\r
        KEYP\r
                                                        #endif  //scrollload\r
 \r
@@ -299,6 +317,7 @@ PRINTBB; KEYP
 #endif\r
        DebugMemory_(&gvar, 1);\r
        MM_DumpData(&gvar);\r
+       KEYP\r
        MM_Report_(&gvar);\r
        //printf("bakapee1=%s\n", bakapee1);\r
        //printf("bakapee2=%s\n", bakapee2);\r
@@ -327,8 +346,8 @@ PRINTBB; KEYP
        printf("========================================\n");\r
 \r
                                                                #ifdef EXMMVERBOSE__\r
-       printf("coreleft():                     %u\n", coreleft());\r
-       printf("farcoreleft():                  %ld\n", farcoreleft());\r
+       printf("coreleft():             %u\n", coreleft());\r
+       printf("farcoreleft():          %ld\n", farcoreleft());\r
                                                                #endif\r
 #ifdef __WATCOMC__\r
 //this is far  printf("Total free:                     %lu\n", (dword)(HC_GetFreeSize()));\r
@@ -336,7 +355,6 @@ PRINTBB; KEYP
 //     printf("HC_farcoreleft():                       %lu\n", (dword)HC_farcoreleft());\r
        //printf("HC_GetNearFreeSize():         %u\n", HC_GetNearFreeSize());\r
        //printf("HC_GetFarFreeSize():                  %lu\n", (dword)HC_GetFarFreeSize());\r
-       HC_heapdump(&gvar);\r
 //     segatesuto();\r
 #endif\r
 #ifdef __BORLANDC__\r
@@ -344,6 +362,7 @@ PRINTBB; KEYP
 //     printf("HC_farcoreleft:                 %lu\n", (dword)HC_farcoreleft());\r
 //     printf("HC_Newfarcoreleft():            %lu\n", (dword)HC_Newfarcoreleft());\r
 #endif\r
+       HC_heapdump(&gvar);\r
        printf("Project 16 ");\r
 #ifdef __WATCOMC__\r
        printf("exmmtest");\r