wwww updated sheet ww

diff --git a/src/palettec.c b/src/palettec.c
index f1057dc015c707d3873a3602f9c1c534d3076fc3..a1e387dc572bb901d2f1d7901848fb19f38a8c27 100755 (executable)
--- a/src/palettec.c
+++ b/src/palettec.c
@@ -34,13 +34,13 @@ main(int argc, char *argv[])
        if(argv[1]) bakapee = argv[1];\r
        else bakapee = "data/default.pal";\r
 \r
-       VGAmodeX(1, &gvar);\r
+       VGAmodeX(1, 1, &gvar);\r
 \r
        pal = modexNewPal();\r
        modexPalSave(pal);\r
 \r
        modexSavePalFile(bakapee, pal);\r
 \r
-       VGAmodeX(0, &gvar);\r
+       VGAmodeX(0, 1, &gvar);\r
 \r
 }\r

diff --git a/src/palettel.c b/src/palettel.c
index a40bd3fd7a8f5cc2f205011fa5b6c442aa9208d8..d07452b6dc8c7edab50b0de2cd743531e33b7960 100755 (executable)
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -38,7 +38,7 @@ main(int argc, char *argv[])
        if(argv[1]) bakapee = argv[1];\r
        else bakapee = "data/default.pal";\r
 //     modexPalSave(pal);\r
-       VGAmodeX(1, &gvar);\r
+       VGAmodeX(1, 1, &gvar);\r
        gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);\r
        modexPalBlack();\r
 \r
@@ -47,7 +47,7 @@ main(int argc, char *argv[])
        modexFadeOn(1, pal);\r
        pdump(&gvar.video.page[0]);\r
        getch();\r
-       modexLeave();//VGAmodeX(0, &gvar);\r
+       VGAmodeX(0, 0, &gvar);\r
        modexPalUpdate1(pal);\r
        /*for(i=0;i<768;i++)\r
        {\r

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 0392b5cb3937f64e3cc44e244d97a7aaaa6a79a3..c05cff5f7f79a2093cb17ba3d895d468a671f6ee 100755 (executable)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -42,7 +42,7 @@ void main() {
        bmp = bitmapLoadPcx("data/koishi^^.pcx");\r
 //     bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");\r
        p = planar_buf_from_bitmap(&bmp);\r
-       VGAmodeX(1, &gvar);\r
+       VGAmodeX(1, 1, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
        /* fix up the palette and everything */\r
@@ -89,7 +89,7 @@ void main() {
        {\r
                //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
        }\r
-       VGAmodeX(0, &gvar);\r
+       VGAmodeX(0, 1, &gvar);\r
        /*printf("\nmain=%Fp\n\n", &i);\r
        printf("bmp.data=%Fp\n", bmp.data);\r
        printf("*bmp.data=%Fp\n", *(bmp.data));\r

diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index 3b83c53dfff92ee8fa67e72233f06381a2f4d04d..059b448acf32a76906e700d6d206504e972695e9 100755 (executable)
--- a/src/pcxtest2.c
+++ b/src/pcxtest2.c
@@ -67,7 +67,7 @@ void main() {
        bmp = bitmapLoadPcx("data/koishi^^.pcx");\r
 //     bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");\r
        p = planar_buf_from_bitmap(&bmp);\r
-       VGAmodeX(1, &gvar);\r
+       VGAmodeX(1, 1, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
        gvar.video.page[0].sw+=32;\r
        gvar.video.page[0].sh+=32;\r
@@ -121,7 +121,7 @@ void main() {
        {\r
                //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
        }\r
-       VGAmodeX(0, &gvar);\r
+       VGAmodeX(0, 1, &gvar);\r
        /*printf("\nmain=%Fp\n\n", &i);\r
        printf("bmp.data=%Fp\n", bmp.data);\r
        printf("*bmp.data=%Fp\n", *(bmp.data));\r

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 9ed1096db65f89f936b6a3b9daf9ecbe11d2d380..06b1f29c8eb812887bf6bd089ff940d67f81d64c 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -64,7 +64,7 @@ baka = 1;
 //getch();\r
 \r
        textInit();\r
-       VGAmodeX(baka, &gvar);\r
+       VGAmodeX(baka, 1, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
        //fix up the palette and everything\r
@@ -110,7 +110,7 @@ getch();
        while(!kbhit())\r
        {\r
        }\r
-       VGAmodeX(0, &gvar);\r
+       VGAmodeX(0, 1, &gvar);\r
 \r
        //print out the contents of each plane\r
        for(plane=0; plane < 4; plane++) {\r

diff --git a/src/scroll.c b/src/scroll.c
index 7d68b45d6e3e65d32d30bd1a9b723b904f5f98d8..5b480cf88da201e342916d146d5110bdc00a0f95 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -118,7 +118,7 @@ void main(int argc, char *argv[])
 #endif
 
        textInit();
-       VGAmodeX(bakapee, &gvar);
+       VGAmodeX(bakapee, 1, &gvar);
 //     printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
 #ifdef FADE
        modexPalBlack();        //reset the palette~
@@ -368,7 +368,7 @@ void main(int argc, char *argv[])
        //TSR
        if(IN_KeyDown(87))      //f11
        {
-               VGAmodeX(0, &gvar);
+               VGAmodeX(0, 0, &gvar);
                IN_Shutdown();
                __asm
                {
@@ -411,7 +411,7 @@ void main(int argc, char *argv[])
        modexSavePalFile("data/g.pal", gpal);
        modexFadeOff(4, gpal);
 #endif
-       VGAmodeX(0, &gvar);
+       VGAmodeX(0, 1, &gvar);
 #endif
        IN_Shutdown();
        printf("Project 16 scroll.exe. This is just a test file!\n");

diff --git a/src/test.c b/src/test.c
index df0af6152a78a5777d4fa77f30ee57af5a009438..b80291fcf740d804c9dfbd91f6dadaff4c3d056a 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -48,7 +48,7 @@ void main(int argc, char *argv[])
        modexFadeOff(1, pal);\r
        modexPalBlack();\r
 \r
-       VGAmodeX(bakapee, &gvar);\r
+       VGAmodeX(bakapee, 1, &gvar);\r
        modexPalBlack();\r
 \r
        IN_Startup();\r
@@ -112,7 +112,7 @@ void main(int argc, char *argv[])
        /* fade back to text mode */\r
        modexFadeOff(1, pal2);\r
        modexPalBlack();\r
-       VGAmodeX(0, &gvar);\r
+       VGAmodeX(0, 1, &gvar);\r
        IN_Shutdown();\r
        printf("Project 16 test.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r