hmmm let me see what i did before wwww

diff --git a/16.exe b/16.exe
index d5d82999831a24d97476d01d64e8ce3b5f42a2a5..2f888ff5b922f9f889d2c21009311a5fa39df440 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 058950a10b711e904204232457159f91c863a492..a57147b3ce6b7a166209665963c680610fe4c0f5 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/maptest.exe b/maptest.exe
index 52f66585bcd561d1d29ab7bfcbb0bde6ea9e1d18..b9ff97de64e94e00b2fc7d983fd0b2cd57a7101c 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 9bbd7e12c6e3299be1ad4a5b1da0a6d823df48cc..42a26c7edc8cef9f932ac7cfdbf4a9b447a4dd7f 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
index b1c39e3115e6ec88c87942154b598588856d7d87..5ce969cc6f1eef25c3043618857c3a4a652a634e 100755 (executable)
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ

diff --git a/planrpcx.exe b/planrpcx.exe
index 489d0e8784a56cfc5173f28ed18aae181f34d330..0ca8800a2ebfa25cbabcdf0c02056e32dc20a252 100755 (executable)
Binary files a/planrpcx.exe and b/planrpcx.exe differ

diff --git a/scroll.exe b/scroll.exe
index 8c3a3e17d4f2d2abe428e76d3e81066fc8892778..dc868b0e5a815fd819a4ebcfb67992f16d9b8eb1 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index f4a07ad40d69021e98c27a05bda9e91510ed803e..81f24beaf5ec59d2c9b33896b41781952a62d5a1 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -24,7 +24,6 @@
  */
 #ifndef MODEX16_H
 #define MODEX16_H
-//#include <conio.h>
 
 #include "src/lib/16_head.h"
 #include "src/lib/bitmap.h"
@@ -134,9 +133,6 @@ extern byte far*  VGA;  /* The VGA Memory */
 #define SET_MODE               0x00
 #define VGA_256_COLOR_MODE     0x13
 #define TEXT_MODE              0x03
-//#define SCREEN_WIDTH         320
-//#define SCREEN_HEIGHT                240
-//#define PAGE_SIZE            (word)(SCREEN_WIDTH/4 * SCREEN_HEIGHT)
 
 #define AC_INDEX               0x03c0
 #define SC_INDEX               0x03c4

diff --git a/src/lib/modex16/16render.c b/src/lib/modex16/16render.c
index 89ba13dcd153e03375c64b27c692314ca2907d5c..0a6298bcba98c75410a83b1788b7c967a1f79cc9 100755 (executable)
--- a/src/lib/modex16/16render.c
+++ b/src/lib/modex16/16render.c
@@ -289,8 +289,8 @@ modexDrawBmpPBufRegion(page_t *page, int x, int y,
        word poffset = (word) page->data  + y*(page->width/4) + x/4;\r
        byte *data = *bmp->plane;//+bmp->offset;\r
        word bmpOffset = (word) data + ry * bmp->width + rx;\r
-       word width = rw/4;\r
-       word height = rh/4;\r
+       word width = rw;\r
+       word height = rh;\r
        byte plane = 1 << ((byte) x & 0x03);\r
        word scanCount = width/4 + (width%4 ? 1 :0);\r
        word nextPageRow = page->width/4 - scanCount;\r
@@ -356,8 +356,8 @@ modexDrawSpritePBufRegion(page_t *page, int x, int y,
        word poffset = (word)page->data + y*(page->width/4) + x/4;\r
        byte *data = *bmp->plane;//+bmp->offset;\r
        word bmpOffset = (word) data + ry * bmp->width + rx;\r
-       word width = rw/4;\r
-       word height = rh/4;\r
+       word width = rw;\r
+       word height = rh;\r
        byte plane = 1 << ((byte) x & 0x03);\r
        word scanCount = width/4 + (width%4 ? 1 :0);\r
        word nextPageRow = page->width/4 - scanCount;\r

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 9f4936b96cc951548f0da81797c5bc17acb61262..2e1cd4883a74617ae1afbde2a0e3a37d0e9e52d8 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -56,7 +56,7 @@ typedef struct {
 } tileset_t;\r
 \r
 typedef struct {\r
-       byte far *plane[4];     /* 4 planes of image data */\r
+       byte huge *plane[4];     /* 4 planes of image data */\r
        word width;         /* width of the image (spread across 4 planes) */\r
        word height;        /* height of the image (spread across 4 planes) */\r
        word pwidth;        /* the number of bytes in each plane */\r

diff --git a/src/planrpcx.c b/src/planrpcx.c
index cb12e6ade816a48a1be1dc7001470b6a57330b3b..46aea023793616085b150acef4ccf337723f8d0d 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -30,7 +30,7 @@ planar_buf_t p, ptmp;
 int i;\r
 word start;//, w;\r
 int plane;\r
-float t1, t2, tpee;\r
+float t1, t2, t3, t4, tpee;\r
 int x,y;\r
 word px,py;\r
 sword baka;\r
@@ -78,23 +78,30 @@ baka = 1;
        start = *clockw;\r
 //             oldDrawBmp(VGA, 20, 20, &bmp, 0);\r
        for(i=0; i<100 ;i++) {\r
-               modexDrawBmpPBufRegion  (&gvar.video.page[0], 32, 32, 0, 0, p.width, p.height, &p);\r
-//             modexDrawBmpPBuf                (&gvar.video.page[0], 32, 32, p);\r
+               modexDrawBmpPBuf                (&gvar.video.page[0], 32, 32, &p);\r
        }\r
        t1 = (*clockw-start) /18.2;\r
+       for(i=0; i<100 ;i++) {\r
+               modexDrawBmpPBufRegion  (&gvar.video.page[0], p.width+32, 32, 0, 0, p.width, p.height, &p);\r
+       }\r
+       t2 = (*clockw-start) /18.2;\r
        getch();\r
 //     start = *clockw;\r
 //             modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);\r
 //     t2 = (*clockw-start)/18.2;\r
        start = *clockw;\r
        for(i=0; i<100 ;i++) {\r
-//             modexDrawPBuf(&gvar.video.page[0], 0, 0, &p, 0);\r
-               modexDrawBmpPBuf                (&gvar.video.page[0], p.width+32, 32, &p);\r
+               modexDrawPBuf           (&gvar.video.page[0], 0, 0, &p, 0);\r
        }\r
-       t2 = (*clockw-start) /18.2;\r
-//++++ modexPalUpdate1(ptmp.palette);\r
+       t3 = (*clockw-start) /18.2;\r
+       for(i=0; i<100 ;i++) {\r
+               modexDrawPBufRegion     (&gvar.video.page[0], 0, 0, 0+p.width, 0, p.width, p.height, &p, 0);\r
+       }\r
+       t4 = (*clockw-start) /18.2;\r
+       //++++  modexPalUpdate1(ptmp.palette);\r
        //modexDrawBmpPBufRegion(&gvar.video.page[0], 64, 64, 48, 32, 24, 32, ptmp);\r
-       modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmp, 0);\r
+       //modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmp, 0);\r
+getch();\r
        while(!kbhit())\r
        {\r
        }\r
@@ -135,12 +142,12 @@ baka = 1;
        chw += xp;\r
        fprintf(stderr,"Project 16 planrpcx.exe. This is just a test file!\n");\r
        fprintf(stderr,"version %s\n", VERSION);\r
-       //fprintf(stderr,"%d\n", sizeof(p.plane));\r
-       //fprintf(stderr,"pw=%d\n", p.width);\r
-       //fprintf(stderr,"ph=%d\n", p.height);\r
-       //fprintf(stderr,"ppw=%d\n", p.pwidth);\r
-       //fprintf(stderr,"%d\n", sizeof(p));\r
-       //fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(p.width), gvar.video.page[0].sh-(p.height));\r
+       fprintf(stderr,"%d\n", sizeof(p.plane));\r
+       fprintf(stderr,"pw=%d\n", p.width);\r
+       fprintf(stderr,"ph=%d\n", p.height);\r
+       fprintf(stderr,"ppw=%d\n", p.pwidth);\r
+       fprintf(stderr,"%d\n", sizeof(p));\r
+       fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(p.width), gvar.video.page[0].sh-(p.height));\r
        free(bakapeee);\r
        //fprintf(stderr, "modexDrawBmpPBuf:    %f\n", t1);\r
        //fprintf(stderr, "modexDrawPBuf:       %f\n", t2);\r

diff --git a/test.exe b/test.exe
index c42ae469723f550f66d5cc587c9e37291fd395da..5caab69386aa89e63a762ad12b3c7ff2ce267c2a 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 886eb317f8d19daa62016d36b3c7aa0054b8e6db..6cddf533946b4db0bfbb8facfa4e0ca43db2471b 100755 (executable)
Binary files a/test2.exe and b/test2.exe differ