attempted~

[16.git] / src / planrpcx.c

diff --git a/src/planrpcx.c b/src/planrpcx.c
index fea908f5d4e3e154067f64527b35f929b8a4afbc..fdbc6df30271b8d7b7bd0d946443292650667a71 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -24,13 +24,10 @@
 #include <dos.h>\r
 #include <string.h>\r
 #include "src/lib/modex16.h"\r
-#include "src/lib/bitmap.h"\r
-#include "src/lib/planar.h"\r
+#include "src/lib/modex16/planar16.h"\r
 \r
 global_game_variables_t gvar;\r
-bitmap_t bmp, ptmpbt;\r
-//planar_buf_t *p, *ptmp;\r
-planar_buf_t pnp, ptmpnp;\r
+planar_buf_t huge p, ptmp;\r
 \r
 void main(int argc, char *argv[])\r
 {\r
@@ -56,17 +53,13 @@ void main(int argc, char *argv[])
 //     else\r
 baka = 1;\r
 \r
-       bmp = bitmapLoadPcx(bakapeee);\r
-       //p = planar_buf_from_bitmap(&bmp);\r
-       pnp = planar_buf_from_bitmap0(&bmp);\r
-       ptmpbt = bitmapLoadPcx("data/ptmp.pcx");\r
-       //ptmp = planar_buf_from_bitmap(&ptmpbt);\r
-       ptmpnp = planar_buf_from_bitmap0(&ptmpbt);\r
+       p = planarLoadPcx(bakapeee);\r
+       ptmp = planarLoadPcx("data/ptmp.pcx");\r
        VGAmodeX(baka, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
 \r
        /* fix up the palette and everything */\r
-       modexPalUpdate1(bmp.palette);\r
+       modexPalUpdate1(p.palette);\r
 \r
        /* clear and draw one sprite and one bitmap */\r
        modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 0);\r
@@ -80,8 +73,8 @@ 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, pnp.width, pnp.height, &pnp);\r
-               modexDrawBmpPBuf                (&gvar.video.page[0], 32, 32, &pnp);\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
        }\r
        t1 = (*clockw-start) /18.2;\r
 //     start = *clockw;\r
@@ -89,13 +82,13 @@ baka = 1;
 //     t2 = (*clockw-start)/18.2;\r
        start = *clockw;\r
        for(i=0; i<100 ;i++) {\r
-               modexDrawPBuf(&gvar.video.page[0], 0, 0, &pnp, 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
-       //modexDrawBmpPBufRegion(&gvar.video.page[0], 64, 64, 48, 32, 24, 32, &ptmpnp);\r
-       modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmpnp, 0);\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
        while(!kbhit())\r
        {\r
        }\r
@@ -105,9 +98,9 @@ baka = 1;
        for(plane=0; plane < 4; plane++) {\r
                i=0;\r
                printf("Plane %d\n", plane);\r
-               for(py=0; py < ptmpnp.height; py++) {\r
-                       for(px=0; px < ptmpnp.pwidth; px++) {\r
-                               printf("%02X ", (int) ptmpnp.plane[plane][i++]);\r
+               for(py=0; py < ptmp.height; py++) {\r
+                       for(px=0; px < ptmp.pwidth; px++) {\r
+                               printf("%02X ", (int) ptmp.plane[plane][i++]);\r
                        }\r
                        printf("\n");\r
                }\r
@@ -135,12 +128,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(pnp.plane));\r
-       fprintf(stderr,"pw=%d\n", pnp.width);\r
-       fprintf(stderr,"ph=%d\n", pnp.height);\r
-       fprintf(stderr,"ppw=%d\n", pnp.pwidth);\r
-       fprintf(stderr,"%d\n", sizeof(bmp));\r
-       fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(pnp.width), gvar.video.page[0].sh-(pnp.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
        //planar_buf_free(p);\r
        free(bakapeee);\r
        fprintf(stderr, "modexDrawBmpPBuf:      %f\n", t1);\r