wwww reverted because zcroll broke

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 881239de5501212185693d31c713e31631ed3a4f..71c5667ddf7eece28600f5cc4c64835bfe156714 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -689,18 +689,7 @@ modexLoadPalFile(byte *filename, byte **palette) {
 \r
 void VL_LoadPalFile(const char *filename, byte *palette)\r
 {\r
-       int fd;\r
-\r
-       fd = open(filename,O_RDONLY|O_BINARY);\r
-       if (fd >= 0) {\r
-               word i;\r
-\r
-               read(fd,palette,        PAL_SIZE);\r
-               close(fd);\r
-\r
-               vga_palette_lseek(0);\r
-               for (i=0;i < 256;i++) vga_palette_write(palette[(i*3)+0]>>2,palette[(i*3)+1]>>2,palette[(i*3)+2]>>2);\r
-       }\r
+       VL_LoadPalFilewithoffset(filename, palette, 0);\r
 }\r
 \r
 void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o)\r
@@ -714,8 +703,8 @@ void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o)
                read(fd,palette,        PAL_SIZE);\r
                close(fd);\r
 \r
-               vga_palette_lseek(o);\r
-               for (i=o;i < 256-o;i++) vga_palette_write(palette[(i*3)+0]>>2,palette[(i*3)+1]>>2,palette[(i*3)+2]>>2);\r
+               vga_palette_lseek(1+o);\r
+               for (i=o;i < 255-o;i++) vga_palette_write(palette[(i*3)+0]>>2,palette[(i*3)+1]>>2,palette[(i*3)+2]>>2);\r
        }\r
 }\r
 \r

diff --git a/src/lib/16_vlpal.c b/src/lib/16_vlpal.c
index 2f155f03a43256587a2878aa9c913be79be9d6ab..3a809828e52704bdc6e0adb8b47393926edf3066 100755 (executable)
--- a/src/lib/16_vlpal.c
+++ b/src/lib/16_vlpal.c
@@ -32,7 +32,7 @@ void modexchkcolor(imgtestpal_t *bmp, word *q, word *a, word *aa, word *z, word
                modexPalSave(pal);\r
                CHKCOLDBGOUT1\r
                //check palette for dups\r
-               for(; (*z)<PAL_SIZE; (*z)+=3)\r
+               for(; (*z)<PAL_SIZE-3; (*z)+=3)\r
                {\r
                        CHKCOLDBGOUT2\r
                        //if((*z)%3==0)\r
@@ -99,7 +99,7 @@ VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset)
        word w=0;\r
        word q=0;\r
        word qq=0;\r
-       static word a[PAL_SIZE];        //palette array of change values!\r
+       static word a[PAL_SIZE-3];      //palette array of change values!\r
        word z=0, aq=0, aa=0, pp=0;\r
 \r
        //modexWaitBorder();\r
@@ -107,7 +107,7 @@ VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset)
        if((*i)==0)\r
        {\r
                memset(a, -1, sizeof(a));\r
-               outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */\r
+               outp(PAL_WRITE_REG, 1);  /* start at the beginning of palette */\r
        }\r
        else if(qp==0)\r
        {\r
@@ -122,11 +122,11 @@ VL_palette(imgtestpal_t *bmp, byte *p, word *i, word qp, word aqoffset)
                printf("qq: %02d\n", (qq));//\r
                printf("          (*i)-q=%02d\n", (*i)-q);//\r
 #endif\r
-               outp(PAL_WRITE_REG, qq);  /* start at the beginning of palette */\r
+               outp(PAL_WRITE_REG, qq);\r
        }\r
-       if((*i)<PAL_SIZE && w==0)\r
+       if((*i)<PAL_SIZE-3 && w==0)\r
        {\r
-               for(; (*i)<PAL_SIZE; (*i)++)\r
+               for(; (*i)<PAL_SIZE-3; (*i)++)\r
                {\r
                        //if(i%3==0 && (p[i+5]==p[i+4] && p[i+4]==p[i+3] && p[i+3]==p[i+2] && p[i+2]==p[i+1] && p[i+1]==p[i] && p[i+5]==p[i]))\r
 //____           if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else\r