^^ yay!!

[16.git] / src / lib / modex16 / 16render.c

diff --git a/src/lib/modex16/16render.c b/src/lib/modex16/16render.c
index 500afdbf54393c010bf954aba32d416c13027604..f80d5ea8fc367bcd1a2aa9460d7758c0cd30e441 100755 (executable)
--- a/src/lib/modex16/16render.c
+++ b/src/lib/modex16/16render.c
@@ -31,33 +31,31 @@
 //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
-       sword plane;\r
+       word plane;\r
        int i;\r
-       const int px=x;//-page->dx;\r
-       const int py=y;//-page->dy;\r
-       #define PEEE ((rw)/4)-rx\r
-       //-(rx/4)\r
-       #define PEEEE ((p->pwidth)*(ry))\r
-       //y=py;\r
-       //x=px;\r
+       const int px=x+page->dx;\r
+       const int py=y+page->dy;\r
+       const int prw = rw/4;\r
+       rx+=1;\r
+       ry+=1;\r
+       #define PEEE    rx-prw\r
+       #define PE              (p->pwidth)\r
+       #define PEEEE   (PE*(ry))\r
+       y=py;\r
+       x=px;\r
        //printf("%d,%d p(%d,%d) r(%d,%d) rwh(%d,%d)\n", x, y, px, py, rx, ry, rw, rh);\r
        for(plane=0; plane < 4; plane++) {\r
                i=PEEE+PEEEE;\r
-               //printf("PEEE=%d ", PEEE);\r
-               //printf("PEEEE=%d ", PEEEE);\r
-               //printf("i=%d\n", i);\r
-               modexSelectPlane(PLANE(plane+x));\r
+               modexSelectPlane(PLANE(plane-1));\r
                for(; y < py+rh; y++) {\r
                        //for(px=0; px < p->width; px++) {\r
                                //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) + (x / 4)), &(p->plane[plane][i+=p->pwidth]), (rw/4));\r
+                               _fmemcpy(page->data + (((page->width/4) * (y)) + ((x) / 4)), &(p->plane[plane][i]), prw);\r
+                               i+=PE;\r
                        //}\r
-                       //if(plane==3) IN_Ack();\r
                }\r
-               /*printf("y%d=%d ", plane, y);\r
-               if(plane==3) printf("y%d=%d\n", plane, y);*/\r
                x=px;\r
                y=py;\r
                }\r
@@ -68,7 +66,9 @@ void modexDrawPBufRegion      (page_t *page, int x, int y, int rx, int ry, int rw, in
 void\r
 modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)\r
 {\r
-       int plane;\r
+       modexDrawPBufRegion     (page, x, x, 0, 0, p->width, p->height, p, sprite);\r
+       /*\r
+       sword plane;\r
        int i;\r
 //     byte near *buff;\r
        const int px=x+page->dx;\r
@@ -107,7 +107,7 @@ modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
                x=px;\r
                y=py;\r
        }\r
-//     _nfree(buff);\r
+//     _nfree(buff);*/\r
 }\r
 \r
 void\r