w

diff --git a/pcx2vrl b/pcx2vrl
index 3d9ac6e6d0e4fe19bb8f1962de5fd02253dea7be..bd947e55158b82b4f9d900234745aca806cde60e 100755 (executable)
Binary files a/pcx2vrl and b/pcx2vrl differ

diff --git a/pcxsscut b/pcxsscut
index d743ac3b8ac58a73b3cb2380e2367aee9b167169..1deec74dc0487422bfdb03acb381df671e83a049 100755 (executable)
Binary files a/pcxsscut and b/pcxsscut differ

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 02313272d9855ae8da34aff0a7aa749e178b9e7b..f04391a95c55d89fb3838ca406b18a429c54c782 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -92,6 +92,9 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
        {\r
                case 1:\r
                        //CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);\r
+                       /*for(i=0; i<CRTParmCount; i++) {\r
+                               outpw(CRTC_INDEX, ModeX_320x240regs[i]);\r
+                       }*/\r
                        /* width and height */\r
                        gv->video.page[0].sw = vga_state.vga_width = 320; // VGA lib currently does not update this\r
                        gv->video.page[0].sh = vga_state.vga_height = 240; // VGA lib currently does not update this\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 8679bf86a51ae1a81791b0803930af46f77ef94a..45c8b137f2558582e1d003f7f8f2cce96b4fc7a9 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -31,7 +31,7 @@
 #include "src/lib/modex16/16planar.h"
 #include "src/lib/16text.h"
 #include "src/lib/modex16/16render.h"
-// #include "src/lib/modex16/320x240.h"
+#include "src/lib/modex16/320x240.h"
 // #include "src/lib/modex16/320x200.h"
 // #include "src/lib/modex16/256x192.h"
 // #include "src/lib/modex16/192x144_.h"

diff --git a/src/test.c b/src/test.c
index c0f1680fb341c460fff4b34b06e3383308d00f7a..8c30c94ea4b7b6ef0baab9daa4fb8f6502c40cc4 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -99,7 +99,7 @@ void main(int argc, char *argv[])
 \r
        /* fill the page with one color, but with a black border */\r
        modexShowPage(&gvar.video.page[1]);\r
-       //modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 0);\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
@@ -109,7 +109,7 @@ void main(int argc, char *argv[])
        /* fade in */\r
        modexFadeOn(1, pal2);\r
 \r
-       i=0,k=0,j=0,pan.pn=0;\r
+       i=0,k=0,j=0,pan.pn=1;\r
        startclk = *clockw;\r
        while(!IN_KeyDown(sc_Escape))\r
        {\r
@@ -149,7 +149,10 @@ 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)) modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width, 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
@@ -158,7 +161,9 @@ void main(int argc, char *argv[])
                //}\r
                if(IN_KeyDown(2)) pan.pn=0;\r
                if(IN_KeyDown(3)) pan.pn=1;\r
-               //if(IN_KeyDown(6)) modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[0].sw-64, gvar.video.page[0].sh-16, 45);\r
+               if(IN_KeyDown(25)){\r
+                       modexpdump(&gvar.video.page[pan.pn]);\r
+               }//p\r
                modexShowPage(&gvar.video.page[pan.pn]);\r
        }\r
 \r

diff --git a/vrl2vrs b/vrl2vrs
index acdd4bda2f0dd8772cdce97a19b6c906e4e09f8e..b67956b7baa37941b88ad79da1a2ff49c0c435a0 100755 (executable)
Binary files a/vrl2vrs and b/vrl2vrs differ

diff --git a/vrsdump b/vrsdump
index 8ba0497deb819d75caeef21a3a0d4086b394845b..dbaba30e42b8639969d3bdd4433243eb338adcbe 100755 (executable)
Binary files a/vrsdump and b/vrsdump differ