fps now is working with scroll wwww

diff --git a/db.exe b/db.exe
index af80cac81c36b2b54df02442584b23793f3cadcb..457a9fa192d31529e39312c63fcfc8b50357625a 100755 (executable)
Binary files a/db.exe and b/db.exe differ

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index b9889a25aa0b6083c62aeabb2ff7d61dff836e03..ec6caf5b6e37250d7135d947f42250cf20173f59 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -113,6 +113,7 @@ typedef struct {
        word stridew;                   /* width/4 */   /* VGA */\r
        word pagesize;                  /* page size */\r
        word pi;                                /* increment page by this much to preserve location */\r
+       int tlx,tly;\r
 //newer vars\r
 //TODO: find where they are used\r
        sword delta;                    // How much should we shift the page for smooth scrolling\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 667d71906b174472d4a2432c5c5c0d7167187be8..757ace2b7f7887731a0b7aaf00306b6682fe5fac 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 667d71906b174472d4a2432c5c5c0d7167187be8
+Subproject commit 757ace2b7f7887731a0b7aaf00306b6682fe5fac

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index a353ccd8200e1f684f8d79e65669c3cecf2693e4..53be25431f654d92eee51246c615db62b2eec997 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -685,8 +685,8 @@ boolean pagedelayrendermap = 0;
 /*     sync    */\r
 void shinku(global_game_variables_t *gv)\r
 {\r
-       word x = (0) + gv->video.page[/*!*/(gv->video.p)].dx; // follow the screen\r
-       word y = (0) + gv->video.page[/*!*/(gv->video.p)].dy; // follow the screen\r
+       word x = gv->video.page[/*!*/(gv->video.p)].dx - (gv->video.page[(gv->video.p)].tlx); // follow the screen\r
+       word y = gv->video.page[/*!*/(gv->video.p)].dy - (gv->video.page[(gv->video.p)].tly); // follow the screen\r
        word col = 2, bgcol = 1, type = 1;//w = 64, h = 8,\r
        if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))\r
        {\r

diff --git a/src/zcroll.c b/src/zcroll.c
index c0bd1079ca92a954dd1c05ba42c81f3f146992e8..c5688601206d47326c575b63346d159c9df2b020 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -141,12 +141,16 @@ void main(int argc, char *argv[])
        }\r
 \r
 //     while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }\r
+       gvar.video.page[0].tlx=mv[0].tx*TILEWH;\r
+       gvar.video.page[0].tly=mv[0].ty*TILEWH;\r
        shinku(&gvar);\r
 #ifdef FADE\r
        modexFadeOn(4, gpal);\r
 #endif\r
        while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\r
        {\r
+               gvar.video.page[0].tlx=mv[0].tx*TILEWH;\r
+               gvar.video.page[0].tly=mv[0].ty*TILEWH;\r
                shinku(&gvar);\r
                //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
                //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction\r

diff --git a/wcpu.exe b/wcpu.exe
index dc69eb74367539890f767ce8868d1d928b5bfdc5..6a5fae4e3fd918f9bbf60ed7c83cc5b9a7215290 100755 (executable)
Binary files a/wcpu.exe and b/wcpu.exe differ