X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fplanrpcx.c;h=dda07176094fa417887619ac22e1ed4893616afd;hb=2eb78909ad7e8079fbec7dbe794fe0eac01e15de;hp=7ed2b7b95bb07214034bf5680575e335a8043be6;hpb=2ac6d138ce852064f3c792957880a87b5f3d4523;p=16.git diff --git a/src/planrpcx.c b/src/planrpcx.c index 7ed2b7b9..dda07176 100755 --- a/src/planrpcx.c +++ b/src/planrpcx.c @@ -28,8 +28,8 @@ #include "src/lib/planar.h" global_game_variables_t gvar; -bitmap_t bmp; -planar_buf_t *p; +bitmap_t bmp, ptmpbt; +planar_buf_t *p, *ptmp; void main(int argc, char *argv[]) { @@ -57,6 +57,8 @@ baka = 1; bmp = bitmapLoadPcx(bakapeee); p = planar_buf_from_bitmap(&bmp); + ptmpbt = bitmapLoadPcx("data/ptmp.pcx"); + ptmp = planar_buf_from_bitmap(&bmp); VGAmodeX(baka, &gvar); gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]); @@ -83,9 +85,12 @@ baka = 1; // t2 = (*clockw-start)/18.2; start = *clockw; for(i=0; i<100 ;i++) { - DrawPBuf(&gvar.video.page[0], 0, 0, p, 0); + modexDrawPBuf(&gvar.video.page[0], 0, 0, p, 0); } t2 = (*clockw-start) /18.2; + getch(); + modexPalUpdate1(ptmpbt.palette); + modexDrawPBufRegion(&gvar.video.page[0], 140, 140, 48, 32, 24, 32, ptmp, 1); while(!kbhit()) { } @@ -106,20 +111,6 @@ baka = 1; printf("\n"); } } - fprintf(stderr,"Project 16 planrpcx.exe. This is just a test file!\n"); - fprintf(stderr,"version %s\n", VERSION); - fprintf(stderr,"%d\n", sizeof(p->plane)); - fprintf(stderr,"pw=%d\n", p->width); - fprintf(stderr,"ph=%d\n", p->height); - fprintf(stderr,"ppw=%d\n", p->pwidth); - fprintf(stderr,"%d\n", sizeof(bmp)); - fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(p->width), gvar.video.page[0].sh-(p->height)); - planar_buf_free(p); - free(bakapeee); - fprintf(stderr, "modexDrawBmp: %f\n", t1); - fprintf(stderr, "DrawPBuf: %f\n", t2); - fprintf(stderr, "gvar.video.page[0].width: %u\n", gvar.video.page[0].width); - fprintf(stderr, "gvar.video.page[0].height: %u\n", gvar.video.page[0].height); col=0x0d, bgcol=0; for(i=0; i<8; i++) { @@ -141,5 +132,19 @@ baka = 1; //fprintf(stderr, "\n"); } chw += xp; + fprintf(stderr,"Project 16 planrpcx.exe. This is just a test file!\n"); + fprintf(stderr,"version %s\n", VERSION); + fprintf(stderr,"%d\n", sizeof(p->plane)); + fprintf(stderr,"pw=%d\n", p->width); + fprintf(stderr,"ph=%d\n", p->height); + fprintf(stderr,"ppw=%d\n", p->pwidth); + fprintf(stderr,"%d\n", sizeof(bmp)); + fprintf(stderr,"%dx%d\n", gvar.video.page[0].sw-(p->width), gvar.video.page[0].sh-(p->height)); + planar_buf_free(p); + free(bakapeee); + fprintf(stderr, "modexDrawBmp: %f\n", t1); + fprintf(stderr, "DrawPBuf: %f\n", t2); + fprintf(stderr, "gvar.video.page[0].width: %u\n", gvar.video.page[0].width); + fprintf(stderr, "gvar.video.page[0].height: %u\n", gvar.video.page[0].height); return; }