xcrollbroke

[16.git] / src / lib / 16_vl.c

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index db066c727762adb2565e5968dd2e9af2512b28b2..dc53d947ba18e67c1f629c689fdb0be349f31301 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -282,7 +282,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
        switch(vq)\r
        {\r
                case 1:\r
-//             case 8: //320x240 no buffer\r
+               case 8: //320x240 no buffer\r
                        //CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);\r
                        /*for(i=0; i<CRTParmCount; i++) {\r
                                outpw(CRTC_INDEX, ModeX_320x240regs[i]);\r
@@ -1107,7 +1107,7 @@ void modexDrawChar(page_t *page, int x/*for planar selection only*/, word t, wor
        }\r
 }\r
 \r
-void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col, word bgcol, boolean sw, const byte *str)\r
+void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word color, word bgcolor, boolean vidsw, const byte *str)\r
 {\r
        word s, o, w;\r
        word x_draw;\r
@@ -1116,7 +1116,7 @@ void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col,
        word addrr;\r
        byte c;\r
 \r
-       switch(sw)\r
+       switch(vidsw)\r
        {\r
                case 0:\r
                        printf("%s\n", str);\r
@@ -1149,7 +1149,7 @@ void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col,
                        // no need for inline assembly!\r
                        // NTS: It might even be faster to just let the modexDrawChar point directly at ROM font than to copy per char! --J.C.\r
                                _fmemcpy(romFontsData.l,MK_FP(s,o+(w*c))/*ROM font location*/,w/*char size*/);\r
-                               modexDrawChar(page, x_draw/*for mode X planar use*/, t, col, bgcol, addrr);\r
+                               modexDrawChar(page, x_draw/*for mode X planar use*/, t, color, bgcolor, addrr);\r
                                x_draw += 8; /* track X for edge of screen */\r
                                addrr += 2; /* move 8 pixels over (2 x 4 planar pixels per byte) */\r
                        }\r
@@ -1374,17 +1374,24 @@ void VL_PrintmodexmemInfo(video_t *v)
 //     printf("========================================\n");\r
        printf("  Virtual Screen: %dx", v->page[0].width);      printf("%d      ", v->page[0].height);  printf("Tile: %dx", v->page[0].ti.tilesw);              printf("%d", v->page[0].ti.tilesh);     printf("=((Virtual Screen)/16)\n");\r
        printf("          Screen: %dx", v->page[0].sw);         printf("%d      ", v->page[0].sh);              printf("Tile: %dx", v->page[0].ti.tw);                  printf("%d", v->page[0].ti.th);         printf("=((Screen)/16)\n");\r
+       printf("  stride: %u ", vga_state.vga_stride);\r
+       printf("draw_stride: %u ", vga_state.vga_draw_stride);\r
+       printf("draw_stride_limit: %u\n", vga_state.vga_draw_stride_limit);\r
 \r
-       printf("  Free Video Memory: %u\n", v->vmem_remain);\r
-       printf("  page");\r
-       for(i=0; i<v->num_of_pages;i++)\r
+       if(v->vmem_remain)\r
+               printf("  Free Video Memory: %u\n", v->vmem_remain);\r
+       if(v->num_of_pages)\r
        {\r
-               printf("        [%u]=", i);\r
-               printf("(%Fp)", (v->page[i].data));\r
-               printf(" size=%u        ", v->page[i].pagesize);\r
-               printf("w=%-3lu  h=%-3lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);\r
-               printf("sw=%-3lu  sh=%-3lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);\r
-               printf("pi=%u", v->page[i].pi);\r
-               printf("\n");\r
+       printf("  page");\r
+               for(i=0; i<v->num_of_pages;i++)\r
+               {\r
+                       printf("        [%u]=", i);\r
+                       printf("(%Fp)", (v->page[i].data));\r
+                       printf(" size=%u        ", v->page[i].pagesize);\r
+                       printf("w=%-3lu  h=%-3lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);\r
+                       printf("sw=%-3lu  sh=%-3lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);\r
+                       printf("pi=%u", v->page[i].pi);\r
+                       printf("\n");\r
+               }\r
        }\r
 }\r