serial debug output added. they are added as _DEBUG_INIT and _DEBUG functions.

[16.git] / src / test.c

diff --git a/src/test.c b/src/test.c
index cb59f47cdea7d7d50a9b1cc4bf244796e83b6fe7..2c698a63327d5217413cfd335b6911a3ca88a045 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -27,7 +27,7 @@
 \r
 global_game_variables_t gvar;\r
 player_t player[MaxPlayers];\r
-map_view_t mv[2];\r
+map_view_t mv[4];\r
 pan_t pan;\r
 \r
 void main(int argc, char *argv[])\r
@@ -64,6 +64,13 @@ void main(int argc, char *argv[])
                return;\r
        }\r
 \r
+       if (_DEBUG_INIT() == 0) {\r
+#ifdef DEBUGSERIAL\r
+               printf("WARNING: Failed to initialize DEBUG output\n");\r
+#endif\r
+       }\r
+       _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log\r
+\r
        /* load our palette */\r
        modexLoadPalFile("data/default.pal", &pal2);\r
 \r
@@ -91,20 +98,24 @@ void main(int argc, char *argv[])
                mv[i].tx        = 0;\r
                mv[i].ty        = 0;\r
        }\r
-//     gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
-//     gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);\r
-//     gvar.video.page[0].width += 32;\r
-//     gvar.video.page[0].height += 32;\r
+//     gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
+//     gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);\r
 \r
 \r
        /* fill the page with one color, but with a black border */\r
+       modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 15);\r
+       modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);\r
+       modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);\r
+       modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);\r
        modexShowPage(&gvar.video.page[1]);\r
        modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15);\r
        modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);\r
        modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42);\r
        modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128);\r
        modexShowPage(&gvar.video.page[0]);\r
-       modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width+32, gvar.video.page[0].height);\r
+       modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width, gvar.video.page[0].height);\r
+       modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47);\r
+       modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45);\r
 \r
        /* fade in */\r
        modexFadeOn(1, pal2);\r
@@ -149,18 +160,20 @@ void main(int argc, char *argv[])
                        baka:\r
                        i++;\r
                        modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width-32, 16, 45);*/\r
-                       if(IN_KeyDown(6))\r
-                       {\r
-                               modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45);\r
-                       }\r
-                       if(IN_KeyDown(4+1)){\r
-                               modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);\r
-                               modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);\r
-                               modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);\r
-                       }\r
+//                     if(IN_KeyDown(6))\r
+//                     {\r
+//                             modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45);\r
+//                     }\r
+//                     if(IN_KeyDown(4+1)){\r
+//                             modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);\r
+//                             modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);\r
+//                             modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);\r
+//                     }\r
                //}\r
-               if(IN_KeyDown(2)) pan.pn=0;\r
-               if(IN_KeyDown(3)) pan.pn=1;\r
+               if(IN_KeyDown(1+1)) pan.pn=0;\r
+               if(IN_KeyDown(2+1)) pan.pn=1;\r
+               if(IN_KeyDown(3+1)) pan.pn=2;\r
+               if(IN_KeyDown(4+1)) pan.pn=3;\r
                if(IN_KeyDown(25)){\r
                        modexpdump(&gvar.video.page[pan.pn]);\r
                }//p\r
@@ -175,16 +188,7 @@ void main(int argc, char *argv[])
        VGAmodeX(0, 1, &gvar);\r
        printf("Project 16 test.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
-       printf("video memory remaining: %ld\n", gvar.video.vmem_remain);\r
-       printf("page ");\r
-       for(i=0; i<gvar.video.num_of_pages;i++)\r
-       {\r
-               printf("        [%u]=", i);\r
-               printf("(%Fp)", (gvar.video.page[i].data));\r
-               printf(" size=%ld", gvar.video.page[i].pagesize);\r
-               printf(" sw=%u  sh=%u\n", gvar.video.page[i].sw, gvar.video.page[i].sh);\r
-               printf("\n");\r
-       }\r
+       modexprintmeminfo(&gvar.video);\r
        printf("tx=%d   ", mv[pan.pn].tx); printf("ty=%d        ", mv[pan.pn].ty); printf("player.d=%d\n", player[0].d);\r
        IN_Shutdown();\r
        modexPalBlack();\r