whent back to copy page wwww

diff --git a/pcx2vrl b/pcx2vrl
index bd947e55158b82b4f9d900234745aca806cde60e..3d9ac6e6d0e4fe19bb8f1962de5fd02253dea7be 100755 (executable)
Binary files a/pcx2vrl and b/pcx2vrl differ

diff --git a/pcxsscut b/pcxsscut
index 1deec74dc0487422bfdb03acb381df671e83a049..d743ac3b8ac58a73b3cb2380e2367aee9b167169 100755 (executable)
Binary files a/pcxsscut and b/pcxsscut differ

diff --git a/scroll.l16 b/scroll.l16
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c3e808612100d8e06f181b39a63b4fb630592c3b 100755 (executable)
--- a/scroll.l16
+++ b/scroll.l16
@@ -0,0 +1,28 @@
+WARNING: Failed to initialize DEBUG output\r
+starting timer ok\r
+index=4096\r
+chkmap ok      Project 16 scroll.exe. This is just a test file!\r
+version Jun  9 2016 11:32:02\r
+tx: 0\r
+ty: 0\r
+player.x: 160          player.y: 128\r
+player.tx: 10          player.ty: 8\r
+player.triggx: 10      player.triggy: 9\r
+player.hp: 4   player.q: 1     player.info.dir: 2      player.d: 2 pdir=0\r
+tile data value at player trigger position: 0\r
+Virtual Screen: 352x272\r
+Screen: 320x240\r
+virtual tile resolution: 22x17\r
+tile resolution: 20x15 \r
+middle tile position: 10x8\r
+video memory remaining: 65535\r
+page   [0]=(a000:0000) size=23936      sw=320  sh=240  width=352  height=272\r
+       [1]=(a000:5d80) size=23936      sw=320  sh=240  width=352  height=272\r
+       [2]=(a000:bb00) size=1024       sw=64  sh=64  width=64  height=64\r
+       [3]=(a000:bf00) size=16640      sw=320  sh=208  width=320  height=208\r
+gvar.video.p=1 gvar.video.r=0 pageflipflop=1\r
+\r
+gvar.video.tickclk=1926.703247\r
+gvar.video.clk=0.000000\r
+\r
+detected CPU type: 386 or newer\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 94a9d59f08c6ec76b121b441098bf070567014d1..748f2ddd23a8b3783ba84fd6b5b2f78d99409b7e 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -603,10 +603,10 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
                mapDrawWRow(&mv[0], tx-1, ty, py);
        i+=mv->map->width - tx;
        }
-       //modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
        /* block copy pattern to where we will draw the sprite */
        vga_setup_wm1_block_copy();
-       _fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);
+       //_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);
+       modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
        /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
        vga_restore_rm0wm0();
        modexCopyPageRegion(mv[3].page, mv[!(mv->video->p)].page, 0/**/, 0/**/, 0, 128, 28, 36);
@@ -792,10 +792,10 @@ void shinku(global_game_variables_t *gv)
        }
        if(pageflipflop){
        if(gv->video.r){
-               //modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);
                /* block copy pattern to where we will draw the sprite */
                vga_setup_wm1_block_copy();
-               _fmemmove((gv->video.page[(gv->video.p)]).data, (gv->video.page[(!gv->video.p)]).data, gv->video.page[(!gv->video.p)].pagesize);
+               //_fmemmove((gv->video.page[(gv->video.p)]).data, (gv->video.page[(!gv->video.p)]).data, gv->video.page[(!gv->video.p)].pagesize);
+               modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);
                /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
                vga_restore_rm0wm0();
                modexShowPage(&(gv->video.page[gv->video.p]));

diff --git a/src/scroll.c b/src/scroll.c
index 92cdf662394713dc6b8256e5513ceb197035adf7..4bb417967835c5783096b0c4396eb2a1a5061856 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -190,7 +190,8 @@ void main(int argc, char *argv[])
        //IN_initplayer(&player, 1);
 
 #ifndef        SPRITE
-       modexClearRegion(mv[1].page, player[0].x, player[0].y-TILEWH, 24, 32, 15);
+       modexClearRegion(mv[0].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
+       modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 #else
        //PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,       PLAYERBMPDATA);
        PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &pp);

diff --git a/src/test.c b/src/test.c
index 69d35d0483e66216c25345f92304db9bc5a7635c..098c12a7f71833fdb11d8615cfbca93b84fed013 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -184,6 +184,8 @@ void main(int argc, char *argv[])
                if(IN_KeyDown(2+1)){ pan.pn=1; }\r
                if(IN_KeyDown(3+1)){ pan.pn=2; }\r
                if(IN_KeyDown(4+1)){ pan.pn=3; }\r
+               if(IN_KeyDown(12)) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);\r
+               if(IN_KeyDown(13)) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);\r
                if(IN_KeyDown(7)){\r
                        for(i=0;i<3;i++)\r
                        {\r

diff --git a/vrl2vrs b/vrl2vrs
index b67956b7baa37941b88ad79da1a2ff49c0c435a0..acdd4bda2f0dd8772cdce97a19b6c906e4e09f8e 100755 (executable)
Binary files a/vrl2vrs and b/vrl2vrs differ

diff --git a/vrsdump b/vrsdump
index dbaba30e42b8639969d3bdd4433243eb338adcbe..8ba0497deb819d75caeef21a3a0d4086b394845b 100755 (executable)
Binary files a/vrsdump and b/vrsdump differ