wwwwwww

diff --git a/16.exe b/16.exe
index c5814a133c299f162e908b241a761023979fbd71..e9b826c7c90b695cf78bd6f10df826c81d559d06 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/bakapi.exe b/bakapi.exe
index 826a04b24467c3fe5ced0c1220a94afb326c23f7..c1dc4e1d3d789b03f7e8bb76549bde5873cbdb90 100755 (executable)
Binary files a/bakapi.exe and b/bakapi.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 3c19abdd72d2f0eb3e48538da040d232fa93bb91..3fb55e35beca04d7cd2bc79b6dba396224fa2199 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index fa7f23df26c972dd9cc7aa6d78a5f6c9de17d763..01aa507996dbefc7eaed0d825da715ba5965f3b0 100755 (executable)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index 5731cfaa1ea424cfef3593662f35cd2b44e0de79..78118a324702b81b5d1146c78798b57f8f169619 100755 (executable)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 1a6d3db89a471974c403bd099fae358427c3f3b5..245ac55a5272926dc4152e53f754f4c92f13bd57 100755 (executable)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index abc012c0c1b603311622362711dadd20824fe9db..df1becf1dc4da6789d5c5633b291c82b4a7b29e3 100755 (executable)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/maptest.exe b/maptest.exe
index 3c334372507a775ea32656fdd329a6fafe211693..de0a26ee2a7e69ea21e0833a8068ba727d57e38a 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index 541a204fb651a6ba4a2d8b1198e0c766788d2a91..21f15bbfbce8c0b903d9858e1b2a22af1d51bffc 100755 (executable)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/palettel.exe b/palettel.exe
index 3cd44e6193519dfa1e5247b82fd9da556c86b637..f0f993b79bd4de9084535a0d8c4e52ab5903fa83 100755 (executable)
Binary files a/palettel.exe and b/palettel.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index de97e0422a7e85fad46211f83c1578cc91287f60..597fad83edd3fec7638230cfb626a972390aaafd 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
index 8b127a11a462d41ebb9e57aa6fae2487b80ef9ad..7f3ebbd247fd9f7c2c17207f753a8c5f98e45e5b 100755 (executable)
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ

diff --git a/planrpcx.exe b/planrpcx.exe
index 53bb91b9b596b58dda03da0b765818efb15f5907..af2dd6a42d3a7324eab31d0257cc460625bcf1f8 100755 (executable)
Binary files a/planrpcx.exe and b/planrpcx.exe differ

diff --git a/scroll.exe b/scroll.exe
index cd163af18d3a0dd2a424cbe6d50ffb64dfb6eba9..2ff8350aca663250519f25f74b0f740808e12e7c 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 366d6fa2dd2846f144e1391629e51a8cf1c6a2c6..63231108b1968d7f7d3b4606ac29bdf863714ab4 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -413,7 +413,7 @@ void modexDrawPBufRegion    (page_t *page, int x, int y, int rx, int ry, int rw, in
                                //printf("%02X ", (int) p->plane[plane][i++]);\r
 //                           _fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);\r
 //                           printf("buff %u==%s\n", y, *buff);\r
-                               _fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=rw]), rw/4);\r
+                               _fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=p->pwidth]), rw/4);\r
                        //}\r
                }\r
                x=px;\r
@@ -424,7 +424,7 @@ void modexDrawPBufRegion    (page_t *page, int x, int y, int rx, int ry, int rw, in
 \r
 /*temp*/\r
 void\r
-DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)\r
+modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)\r
 {\r
        int plane;\r
        int i;\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 5b0d82b0b822f2ccdfc3c9c35715f009a694aeb6..9c9ea4bb6a4c00f54215d5e6077a13f9db456331 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -75,7 +75,6 @@ void modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite);
 void oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite);
 void modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp);
 void modexDrawBmpRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp);
-void modexDrawPlanarBuf(page_t *page, int x, int y, planar_buf_t *bmp);
 void modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp);
 void modexDrawSpriteRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp);
 void modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 9792a024fbcf6f7d1e70b77327b414c11637eab9..dda07176094fa417887619ac22e1ed4893616afd 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -28,8 +28,8 @@
 #include "src/lib/planar.h"\r
 \r
 global_game_variables_t gvar;\r
-bitmap_t bmp;\r
-planar_buf_t *p;\r
+bitmap_t bmp, ptmpbt;\r
+planar_buf_t *p, *ptmp;\r
 \r
 void main(int argc, char *argv[])\r
 {\r
@@ -57,6 +57,8 @@ baka = 1;
 \r
        bmp = bitmapLoadPcx(bakapeee);\r
        p = planar_buf_from_bitmap(&bmp);\r
+       ptmpbt = bitmapLoadPcx("data/ptmp.pcx");\r
+       ptmp = planar_buf_from_bitmap(&bmp);\r
        VGAmodeX(baka, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
@@ -83,9 +85,12 @@ baka = 1;
 //     t2 = (*clockw-start)/18.2;\r
        start = *clockw;\r
        for(i=0; i<100 ;i++) {\r
-               //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
+               modexDrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
        }\r
        t2 = (*clockw-start) /18.2;\r
+       getch();\r
+       modexPalUpdate1(ptmpbt.palette);\r
+       modexDrawPBufRegion(&gvar.video.page[0], 140, 140, 48, 32, 24, 32, ptmp, 1);\r
        while(!kbhit())\r
        {\r
        }\r

diff --git a/src/scroll.c b/src/scroll.c
index 4f35035bf20b5370931ab5bcf70d4e6c7be1112d..c5280652903e8d07cfb70168fa7b320e49373337 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -121,7 +121,7 @@ void main(int argc, char *argv[])
 //     printf("Total used @ before palette initiation:         %zu\n", oldfreemem-GetFreeSize());
 //++++ player[0].data.offset=(paloffset/3);
 //++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
-               modexPalUpdate1(gpal);
+               modexPalUpdate1(p.palette);
        //printf("      %d\n", sizeof(ptmp->data));
        //printf("1:    %d\n", paloffset);
 //++++ map.tiles->data->offset=(paloffset/3);

diff --git a/test.exe b/test.exe
index 79335f4e1211506a9923a71a8323716bb4eca0b4..a5a0ebae8f69ccdbd8ebe4e26e880d54a7f9dd68 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index da8490d20d706f5ece8a67799692eff1973219e1..e1fc73c85f64e1bbf7bcdb3dffc5badeaca11d85 100755 (executable)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/tesuto.exe b/tesuto.exe
index 6dbf027edf2117d3a5a54f2fd40b88760076686f..e475c0f0f3cd7c457657e254c392b3136a048adf 100755 (executable)
Binary files a/tesuto.exe and b/tesuto.exe differ

diff --git a/vgmtest.exe b/vgmtest.exe
index e2a5d709a9a6c8199d937fdc392ec2bd89cd577c..f822b1ef93bb838b5fb3442607ba22ebee5394f1 100755 (executable)
Binary files a/vgmtest.exe and b/vgmtest.exe differ