added the new header for new res

[16.git] / src / pcxtest.c

diff --git a/src/pcxtest.c b/src/pcxtest.c
index be51733b77ce894dbeafdbdbcf4e517ea9ed6801..1c80dce78cd3fb318bb6c30c55a7e53c36df921d 100755 (executable)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -27,7 +27,7 @@
 #include "src/lib/bitmap.h"\r
 #include "src/lib/planar.h"\r
 \r
-word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
+global_game_variables_t gvar;\r
 \r
 /*\r
 void\r
@@ -70,7 +70,7 @@ void main() {
        bmp = bitmapLoadPcx("data/koishi^^.pcx");\r
 //     bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");\r
        p = planar_buf_from_bitmap(&bmp);\r
-       modexEnter();\r
+       VGAmodeX(1, &gvar);\r
 \r
        /* fix up the palette and everything */\r
        modexPalUpdate1(bmp.palette);\r
@@ -87,7 +87,7 @@ void main() {
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
 //0000         modexDrawBmp(&page, 20, 20, &bmp);\r
-               modexDrawBmp(&page, 100, 100, &bmp);\r
+               modexDrawBmp(&page, 160, 120, &bmp);\r
        //}\r
        t1 = (*clockw-start) /18.2;\r
 \r
@@ -108,7 +108,7 @@ void main() {
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
 //0000         modexDrawSprite(&page, 20, 20, &bmp);\r
-               modexDrawSprite(&page, 100, 100, &bmp);\r
+               modexDrawSprite(&page, 160, 120, &bmp);\r
        //}\r
        //_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));\r
        //modexDrawBmp(&page, 0, 0, &bmp);\r
@@ -116,18 +116,23 @@ void main() {
        {\r
                //DrawPBuf(&page, 0, 0, p, 0);\r
        }\r
-       modexLeave();\r
-       printf("main=%Fp\n", &i);\r
+       VGAmodeX(0, &gvar);\r
+       /*printf("\nmain=%Fp\n\n", &i);\r
+       printf("bmp.data=%Fp\n", bmp.data);\r
+       printf("*bmp.data=%Fp\n", *(bmp.data));\r
+       printf("&bmp.data=%Fp\n", &(bmp.data));\r
 \r
        printf("\n%d\n", sizeof(p->plane));\r
-       printf("%d\n", sizeof(bmp));\r
+       printf("%d\n", sizeof(bmp));*/\r
 \r
        /*for(i=0; i<(320*240); i++)\r
        {\r
                fprintf(stdout, "%d", bmp.data[i]);\r
-               if(i%320==0) fprintf(stdout, "\n");\r
+               if(i%bmp.width==0) fprintf(stdout, "\n");\r
        }*/\r
        printf("CPU to VGA: %f\n", t1);\r
        printf("VGA to VGA: %f\n", t2);\r
+       printf("page.width: %u\n", page.width);\r
+       printf("page.height: %u\n", page.height);\r
        return;\r
 }\r