going to work on this soon

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 97b26de3c03b182f0ab1cab6ea9dcccf21f0d115..9b47253eef860da180d8901354ac96b6b90377b1 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -395,8 +395,9 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
 }\r
 \r
 //TODO!\r
-void\r
-modexDrawPBufregion(page_t *page, int x, int y, int sx, int sy, int fx, int fy planar_buf_t *p, boolean sprite)\r
+//void\r
+//modexDrawBmpRegion   (page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp)\r
+void modexDrawPBufRegion       (page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite)\r
 {\r
        int plane;\r
        int px, py, i;\r
@@ -420,7 +421,7 @@ modexDrawPBufregion(page_t *page, int x, int y, int sx, int sy, int fx, int fy p
 //             }\r
 //     }\r
        for(plane=0; plane < 4; plane++) {\r
-               i=0;\r
+               i=(rx/4)+((rx/4)*ry);\r
                modexSelectPlane(PLANE(plane+x));\r
                for(; y < py+p->height; y++) {\r
                        //for(px=0; px < p->width; px++) {\r
@@ -437,7 +438,7 @@ modexDrawPBufregion(page_t *page, int x, int y, int sx, int sy, int fx, int fy p
 //     _nfree(buff);\r
 }\r
 \r
-void\r
+/*void\r
 DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)\r
 {\r
        int plane;\r
@@ -477,7 +478,7 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
                y=py;\r
        }\r
 //     _nfree(buff);\r
-}\r
+}*/\r
 \r
 void\r
 oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite)\r
@@ -500,29 +501,6 @@ oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite)
        }\r
 }\r
 \r
-void\r
-CDrawBmp(byte far* vgamem, page_t* page, int x, int y, bitmap_t *bmp, byte sprite)\r
-{\r
-       byte plane;\r
-       word px, py;\r
-       word offset=0;\r
-\r
-\r
-       /* TODO Make this fast.  It's SLOOOOOOW */\r
-       for(plane=0; plane < 4; plane++) {\r
-               modexSelectPlane(PLANE(plane+x));\r
-               for(px = plane; px < bmp->width; px+=4) {\r
-                       offset=px;\r
-                       for(py=0; py<bmp->height; py++) {\r
-                       if(!sprite || bmp->data[offset])\r
-                               //modexputPixel(page, x+px, y+py, bmp->data[offset]);\r
-                               vgamem[PAGE_OFFSET(x+px, y+py)] = bmp->data[offset];\r
-                       offset+=bmp->width;\r
-                       }\r
-               }\r
-       }\r
-}\r
-\r
 void\r
 modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp) {\r
     /* draw the region (the entire freakin bitmap) */\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 44df9810cc00e2942eb992364cda52eda9a21feb..a02112134b98ebb133d087ab79bf8c92cc50e00d 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -70,10 +70,9 @@ void modexShowPage(page_t *page);
 void modexPanPage(page_t *page, int dx, int dy);
 void modexSelectPlane(byte plane);
 void modexClearRegion(page_t *page, int x, int y, int w, int h, byte color);
-void modexDrawPBufregion(page_t *page, int x, int y, int sx, int sy, int fx, int fy planar_buf_t *p, boolean sprite);
-void DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite);
+void modexDrawPBufRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite);
+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 CDrawBmp(byte far* vgamem, page_t* 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);

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 94b08bdb3c5ca780ee3bd7b5ea4fae87f55a1818..9792a024fbcf6f7d1e70b77327b414c11637eab9 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -83,7 +83,7 @@ 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
+               //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
        }\r
        t2 = (*clockw-start) /18.2;\r
        while(!kbhit())\r