==== PRE SHOWPAGE TO SHOWMV CONVERSION ==== i am going to work on a really big area...

diff --git a/src/lib/16render.c b/src/lib/16render.c
index 1a8f81f6fd13af2f05922c3295bc6b7ecb6b3cab..3a3a7a745cf26289a63ca6d3c009e2e909b89382 100755 (executable)
--- a/src/lib/16render.c
+++ b/src/lib/16render.c
@@ -142,7 +142,7 @@ modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp) {
 void\r
 modexDrawBmpRegion(page_t *page, int x, int y,\r
                   int rx, int ry, int rw, int rh, bitmap_t *bmp) {\r
-       word poffset = (word) page->data  + y*(page->width/4) + x/4;\r
+       word poffset = (word)page->data + y*(page->width/4) + x/4;\r
        byte *data = bmp->data;//+bmp->offset;\r
        word bmpOffset = (word) data + ry * bmp->width + rx;\r
        word width = rw;\r

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 6d7f72ed11ce81105f102799a6c2312528d8a556..fba6fb05b06bc1c5982554f5c81107a551e57b2d 100755 (executable)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -184,7 +184,7 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
        ts.palette = result.palette;\r
 \r
        /* allocate the pixel storage for the tiles */\r
-       ts.data = malloc(sizeof(byte*) * ts.ntiles);\r
+       ts.data = _fmalloc(sizeof(byte*) * ts.ntiles);\r
        //ts.data[0] = malloc(sizeof(byte) * ts.ntiles * twidth * theight);\r
        for(i=1; i < ts.ntiles; i++) {\r
                ts.data[i] = ts.data[i-1] + twidth * theight;\r

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 29183665112acc02b629e4c3381e74cb4a8c21ca..a7cb7cc709995ccc302b36f37864190c8f408844 100755 (executable)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -77,12 +77,12 @@ void main() {
        modexPalUpdate1(&PCXBMP->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, 1);\r
+       modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1);\r
 \r
        /* non sprite comparison */\r
-       start = *clockw;\r
+       /*start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
-               oldDrawBmp(VGA, 20, 20, PCXBMPPTR, 0);\r
+               oldDrawBmp(VGA, 0, 0, PCXBMPPTR, 0);\r
        //}\r
 \r
        start = *clockw;\r
@@ -97,20 +97,23 @@ void main() {
 //0000         modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 20, 20, 128, 20, 64, 64);\r
                modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);\r
        //}\r
-       t2 = (*clockw-start)/18.2;\r
+       t2 = (*clockw-start)/18.2;*/\r
 \r
 \r
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
-               oldDrawBmp(VGA, 20, 20, PCXBMPPTR, 1);\r
+               oldDrawBmp(VGA, 0, 0, PCXBMPPTR, 1);\r
        //}\r
+       t1 = (*clockw-start) /18.2;\r
 \r
 \r
        start = *clockw;\r
        //for(i=0; i<100 ;i++) {\r
 //0000         modexDrawSprite(&gvar.video.page[0], 20, 20, PCXBMPPTR);\r
-               modexDrawSprite(&gvar.video.page[0], 160, 120, PCXBMPPTR);\r
+               modexDrawSprite(&(gvar.video.page[0]), 160, 120, PCXBMPPTR);\r
+               modexDrawBmp(&gvar.video.page[0], 0, 128, PCXBMPPTR);\r
        //}\r
+       t2 = (*clockw-start)/18.2;\r
        //_fmemset(MK_FP(0xA000, 0), (int)p->plane, gvar.video.page[0].sw*(gvar.video.page[0].sh*2));\r
        //modexDrawBmp(&gvar.video.page[0], 0, 0, PCXBMPPTR);\r
        while(!kbhit())\r

diff --git a/src/scroll.c b/src/scroll.c
index be99ae36f314108c21d5dc3e253f5e7618ba1888..ceb76bcc9f4eb183074ec24ad58c72ea708b9ae2 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -129,7 +129,6 @@ void main(int argc, char *argv[])
        if(!pageflipflop)       VL_ShowPage(mv[1].page, 0, 0);//modexShowPage(mv[1].page);\r
        else                    ZC_ShowMV(&mv, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\r
 \r
-\r
        modexDrawBmp(&gvar.video.page[0], 16, 16, PCXBMPPTR);\r
        /* buffer pages */\r
 //     modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47);\r

diff --git a/src/test.c b/src/test.c
index a38f4b7ec94b92e0cf084d58e8c8ada10747575b..bd0f7e7cf89e708f9cf928a022b2cef49d668d53 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -44,15 +44,10 @@ void main(int argc, char *argv[])
        word startclk, endclk;\r
        word k;\r
        //====byte *pal, *pal2;\r
-       sword bakapee;\r
 \r
        //====word colo=LGQ;\r
        gvar.video.panp=0;\r
 \r
-       //argument\r
-       if(argv[1]) bakapee = atoi(argv[1]);\r
-       else bakapee = 1;\r
-\r
        // DOSLIB: check our environment\r
        /*probe_dos();\r
 \r
@@ -94,7 +89,7 @@ void main(int argc, char *argv[])
        IN_Default(0,&player,ctrl_Keyboard1);\r
        IN_initplayer(&player, 0);\r
 \r
-       VGAmodeX(bakapee, 1, &gvar);\r
+       VGAmodeX(1, 1, &gvar);\r
        //====modexPalBlack();\r
 \r
        /* load our palette */\r
@@ -198,6 +193,7 @@ void main(int argc, char *argv[])
 //                     if(i>PAL_SIZE) i=0;\r
                }//9*/\r
                if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.panp]); IN_UserInput(1,1); }//p\r
+               if(IN_KeyDown(sc_F8)){ modexDrawSprite(&gvar.video.page[0], 160, 120, PCXBMPPTR); IN_UserInput(1,1); }//f8\r
                //VL_ShowPage(&gvar.video.page[gvar.video.panp], 0, 0);\r
                ZC_ShowMV(&mv, 0, 0);\r
        }\r