0.exe is not working how i want

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 22dde47a8a07720455fd08777e66161a3feda1a3..b71dfb1f7b48caeba292e27f3b61d7cf62057da7 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -125,23 +125,14 @@ 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
        mapGoTo(mv, 0, 0);\r
        //_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);\r
 \r
-       //TODO: put player in starting position of spot\r
-       //default player position on the viewable map\r
-       player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;\r
-       player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;\r
+       playerXYpos(0, 0, &player, &mv, 0);\r
        IN_initplayer(&player, 0);\r
 \r
 #ifndef        SPRITE\r
@@ -188,7 +179,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 +248,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