something is badly broken in palette experiment

diff --git a/TEST.L16 b/TEST.L16
index 2171f5a1c364f4141a0318c49060417afd460275..a3040c14feb1f8ea936d2ef39a7d170c37ae8044 100755 (executable)
--- a/TEST.L16
+++ b/TEST.L16
@@ -792,7 +792,7 @@ p[]=740  qp=765   p[]-qp=1505
 qqqqqqqq\r
 \r
 Project 16 test.exe. This is just a test file!\r
-version Feb 10 2017 09:25:47\r
+version Feb 10 2017 09:28:45\r
 VL_PrintmodexmemInfo:\r
   Virtual Screen: 352x272      Tile: 22x17=((Virtual Screen)/16)\r
          Screen: 320x240       Tile: 20x15=((Screen)/16)\r
@@ -801,7 +801,7 @@ VL_PrintmodexmemInfo:
        [1]=(a000:5d80) size=23936      w=352  h=272 sw=320  sh=240 pi=1408\r
        [2]=(a000:bb00) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
        [3]=(a000:dc00) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
-tx=1   ty=1    player.d=2\r
+tx=1   ty=1    player.d=3\r
 \r
 ====\r
 0      paloffset=      255\r

diff --git a/data/16t.pal b/data/16t.pal
new file mode 100755 (executable)
index 0000000..e900d99
Binary files /dev/null and b/data/16t.pal differ

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 13d8c9bb28e0b5c641505d155d80a638c6a8060c..ec5c9f0a9f84c00e581fcbb215a739391f2998a1 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -703,6 +703,22 @@ void VL_LoadPalFile(const char *filename, byte *palette)
        }\r
 }\r
 \r
+void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o)\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(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
+       }\r
+}\r
+\r
 \r
 void\r
 modexSavePalFile(char *filename, byte *pal) {\r

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index 49457d2b696278e4567a24c292dfdf5505ba9c04..e2c28a3242d926f02d7b8e0b9b95eb85db1c3cf8 100755 (executable)
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -125,6 +125,7 @@ void modexPalSave(byte *palette);
 byte *modexNewPal();\r
 void modexLoadPalFile(char *filename, byte **palette);\r
 void VL_LoadPalFile(const char *filename, byte *palette);\r
+void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o);\r
 void modexSavePalFile(char *filename, byte *palette);\r
 \r
 /* fixed palette functions */\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 65f2f5e737a1e6e09f50aece76c2f658259fa66e..e198367cb435957f02aca04aaf37a639bad0b800 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -583,7 +583,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
                        case 0:\r
 #endif\r
 #ifndef TILERENDER\r
-                               if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i);\r
+                               if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i+1);\r
 #else\r
                                modexDrawBmpRegion              (page, x, y, rx, ry, t->tileWidth, t->tileHeight, i);\r
                                /* then the sprite. note modding ram ptr means we just draw to (x&3,0) */\r

diff --git a/src/test.c b/src/test.c
index ceca4f24570c0ce929c96b12a5cb4f727a323cfd..6d130170cf2a3743401cd5eeba4456e626b96cf4 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -30,7 +30,7 @@
 #define HGQ 55\r
 \r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
-static byte palette[PAL_SIZE];\r
+static byte *palette;//[PAL_SIZE];\r
 \r
 void main(int argc, char *argv[])\r
 {\r
@@ -84,7 +84,7 @@ void main(int argc, char *argv[])
        Startup16(&gvar);\r
 \r
        /* save the palette */\r
-       //====pal  = modexNewPal();\r
+       palette = modexNewPal();\r
        //====modexPalSave(pal);\r
        //====modexFadeOff(1, pal);\r
        //====modexPalBlack();\r
@@ -94,16 +94,17 @@ void main(int argc, char *argv[])
        EN_initplayer(&player, 0, &gvar.video);\r
 \r
        VGAmodeX(1, 1, &gvar);\r
-       //====modexPalBlack();\r
+       modexPalBlack();\r
 \r
        /* load our palette */\r
        VL_LoadPalFile("data/16.pal", &gvar.video.palette);\r
        bmp1.offset=(paloffset/3);\r
        VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0);\r
 \r
-       VL_LoadPalFile("data/default.pal", &palette);\r
+       //VL_LoadPalFilewithoffset("data/default.pal", &palette, paloffset);\r
+       modexLoadPalFile("data/16t.pal", &palette);\r
        bmp2.offset=(paloffset/3);\r
-       VL_palette(&bmp2, &palette, &paloffset, 0, 0);\r
+       VL_palette(&bmp2, palette, &paloffset, 0, 0);\r
        //====modexLoadPalFile("data/default.pal", &pal2);\r
 \r
        /* overscan show */\r