X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscroll.c;h=b71dfb1f7b48caeba292e27f3b61d7cf62057da7;hb=a6dac9aacc0353763dc564afda8b57848afc3e0b;hp=18df0c768f997436afa8fdb63bacc53fd34d577e;hpb=0d74366bee7e966aebb95eaaef4f11b088b5d02f;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 18df0c76..b71dfb1f 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -125,23 +125,14 @@ void main(int argc, char *argv[])
 
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	for(i=0;i<gvar.video.num_of_pages;i++)
-	{
-		mv[i].page = &gvar.video.page[i];
-		mv[i].map = &map;
-		mv[i].video = &gvar.video;
-		mv[i].pan	= &pan;
-	}
+	modexMVSetup(&mv, &map, &pan, &gvar);
 
 	/* set up paging */
 	//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
 	mapGoTo(mv, 0, 0);
 	//_fmemcpy(mv[1].page->data, mv[0].page->data, mv[0].page->pagesize);
 
-	//TODO: put player in starting position of spot
-	//default player position on the viewable map
-	player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;
-	player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
+	playerXYpos(0, 0, &player, &mv, 0);
 	IN_initplayer(&player, 0);
 
 #ifndef	SPRITE
@@ -188,7 +179,7 @@ void main(int argc, char *argv[])
 	if(!panswitch){
 		walk(mv, &player, 0);
 	}else{
-		panpagemanual(mv, &player, 0);
+		panPageManual(mv, &player, 0);
 		//printf("	player[0].q: %d", player[0].q);	printf("	player[0].d: %d\n", player[0].d);
 	}