updating

[16.git] / src / planrpcx.c

diff --git a/src/planrpcx.c b/src/planrpcx.c
index 4829b54f7181cc05aa548798afde56aecc40f8ae..4a8295920fb72b3b9421a3b42c8f55e8de87faf4 100755 (executable)
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -28,11 +28,11 @@
 #include "src/lib/planar.h"\r
 \r
 global_game_variables_t gvar;\r
+bitmap_t bmp;\r
+planar_buf_t *p;\r
 \r
 void main(int argc, char *argv[])\r
 {\r
-       bitmap_t bmp;\r
-       planar_buf_t *p;\r
        int i;\r
        word start;\r
        int plane;\r
@@ -44,15 +44,13 @@ void main(int argc, char *argv[])
 \r
        bakapeee = malloc(64);\r
 \r
-       if(argv[1]) bakapeee = argv[1];\r
-       else bakapeee = "data/koishi~.pcx";\r
+       if(argv[1]) bakapeee = argv[1];\r
+       else bakapeee = "data/koishi~.pcx";\r
 \r
-//     if(argv[2]) baka = atoi(argv[2]);\r
-//     else\r
-baka = 1;\r
-//0000 bmp = bitmapLoadPcx("data/koishi~~.pcx");\r
-       bmp = bitmapLoadPcx(bakapeee);\r
-       //bmp = bitmapLoadPcx("data/koishi~.pcx");\r
+       if(argv[2]) baka = atoi(argv[2]);\r
+       else baka = 1;\r
+\r
+       bmp = bitmapLoadPcx(bakapeee);\r
        p = planar_buf_from_bitmap(&bmp);\r
        VGAmodeX(baka, &gvar);\r
        gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
@@ -80,7 +78,7 @@ baka = 1;
 //     t2 = (*clockw-start)/18.2;\r
        start = *clockw;\r
        for(i=0; i<100 ;i++) {\r
-               DrawPBuf(&gvar.video.page[0], gvar.video.page[0].sw-(p->width), gvar.video.page[0].sh-(p->height), p, 0);\r
+               DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);\r
        }\r
        t2 = (*clockw-start) /18.2;\r
        while(!kbhit())\r
@@ -110,6 +108,7 @@ baka = 1;
        fprintf(stderr,"ph=%d\n", p->height);\r
        fprintf(stderr,"ppw=%d\n", p->pwidth);\r
        fprintf(stderr,"%d\n", sizeof(bmp));\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
        fprintf(stderr, "modexDrawBmp:  %f\n", t1);\r
        fprintf(stderr, "DrawPBuf:      %f\n", t2);\r