made a new function modexMVSetup()

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index d3faba1ae31c99200d877d854ef8f9d8466b1c16..d3ff0ef2cc1367f780962d0a63da3719b642df6f 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -125,13 +125,7 @@ void main(int argc, char *argv[])
 \r
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       for(i=0;i<gvar.video.num_of_pages;i++)\r
-       {\r
-               mv[i].page = &gvar.video.page[i];\r
-               mv[i].map = &map;\r
-               mv[i].video = &gvar.video;\r
-               mv[i].pan       = &pan;\r
-       }\r
+       modexMVSetup(&mv, &map, &pan, &gvar);\r
 \r
        /* set up paging */\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
@@ -188,7 +182,7 @@ void main(int argc, char *argv[])
        if(!panswitch){\r
                walk(mv, &player, 0);\r
        }else{\r
-               panpagemanual(mv, &player, 0);\r
+               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
@@ -257,7 +251,8 @@ void main(int argc, char *argv[])
 //             modexDrawSprite(mv[0].page, 16, 16, &p);\r
                modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
        }\r
-       //TODO fmemtest into page\r
+       FUNCTIONKEYFUNCTIONS;\r
+       // fmemtest into page\r
        /*if(IN_KeyDown(4+1))   //4\r
        {\r
                pg=1;\r
@@ -266,8 +261,11 @@ void main(int argc, char *argv[])
        }*/\r
 \r
        //9\r
-       if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
-       //if(IN_KeyDown(11)){ modexPalOverscan(15); }\r
+#ifdef FADE\r
+               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
+#endif\r
+               if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
+\r
        if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!\r
        }\r
 \r