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

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 6c65ced05fe7e022509c5aaaac708f83da9f8cdd..c230981b6c29354b71fb8c805aee4c331275b971 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -129,7 +129,7 @@ void main(int argc, char *argv[])
 \r
        /* set up paging */\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
-       mapGoTo(mv, 0, 0);\r
+       mapGoTo(&mv, 0, 0);\r
        //_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);\r
 \r
        playerXYpos(0, 0, &player, &mv, 0);\r
@@ -144,7 +144,7 @@ void main(int argc, char *argv[])
 #endif\r
 \r
        if(!pageflipflop)       VL_ShowPage(mv[1].page, 0, 0);//modexShowPage(mv[1].page);\r
-       else                    VL_ShowPage(mv[0].page, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\r
+       else                    ZC_ShowMV(&mv, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\r
                shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.\r
 \r
        /* buffer pages */\r
@@ -177,9 +177,9 @@ void main(int argc, char *argv[])
        //player movement\r
                IN_ReadControl(0, &player);\r
        if(!panswitch){\r
-               walk(mv, &player, 0);\r
+               walk(&mv, &player, 0);\r
        }else{\r
-               panPageManual(mv, &player, 0);\r
+               PANKEYFUN;//panPageManual(&mv, &player, 0);\r
                //printf("      player[0].q: %d", player[0].q); printf("        player[0].d: %d\n", player[0].d);\r
        }\r
 \r
@@ -196,13 +196,6 @@ void main(int argc, char *argv[])
        }\r
        if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }\r
        //debugging binds!\r
-       if(IN_KeyDown(2)){ VL_ShowPage(mv[0].page, 0, 0); pan.pn=0; }\r
-       if(IN_KeyDown(3)){ VL_ShowPage(mv[1].page, 0, 0); pan.pn=1; }\r
-       if(IN_KeyDown(4)){ VL_ShowPage(mv[2].page, 0, 0); pan.pn=2; }\r
-       if(IN_KeyDown(4+1)){ VL_ShowPage(mv[3].page, 0, 0); pan.pn=3; }\r
-       if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);\r
-                IN_UserInput(1,1);\r
-       }       //p\r
 #ifdef MODEX\r
 #ifdef FADE\r
        if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p\r