X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=39a9d614c7001c393f373107349529883374db03;hb=9c4ac95a4b988defb3dd98eac76b38fbf7baa762;hp=53b86d6bad212d70f3ad69e985b1b540571900ac;hpb=782eaedec59e2f866a27d8ca49664600b45627a0;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 53b86d6b..39a9d614 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -85,8 +85,6 @@ void main(int argc, char *argv[])
 		return;
 	}
 
-	testcontrolnoisy=0;
-
 	player[0].persist_aniframe=0;
 	player[0].speed=4;
 	//player[0].data = &pp;
@@ -191,18 +189,7 @@ void main(int argc, char *argv[])
 	//default player position on the viewable map
 	player[0].tx = bg->tx + bg->page->tilemidposscreenx;
 	player[0].ty = bg->ty + bg->page->tilemidposscreeny;
-	player[0].x = player[0].tx*TILEWH;
-	player[0].y = player[0].ty*TILEWH;
-	player[0].triggerx = player[0].tx;
-	player[0].triggery = player[0].ty+1;
-/*	player[0].info.x = player[0].tx;
-	player[0].info.xaxis = player[0].tx*TILEWH;
-	player[0].info.y = player[0].ty;
-	player[0].info.yaxis = player[0].ty*TILEWH;*/
-	player[0].q=1;
-	player[0].d=2;
-	player[0].hp=4;
-//	player[0].persist_aniframe=0;
+	IN_initplayer(&player, 0);
 	//npc
 	/*npc0.tx = bg->tx + 1;
 	npc0.ty = bg->ty + 1;
@@ -371,16 +358,16 @@ void main(int argc, char *argv[])
 	if(IN_KeyDown(2)){ modexShowPage(bg->page); panpagenum=0; }
 	if(IN_KeyDown(3)){ modexShowPage(spri->page); panpagenum=1; }
 	if(IN_KeyDown(4)){ modexShowPage(mask->page); panpagenum=2; }
-	if(IN_KeyDown(25)){ pdump(bg->page); pdump(spri->page); }	//p
+	if(IN_KeyDown(25)){ modexpdump(bg->page); modexpdump(spri->page); }	//p
 #ifdef MODEX
 #ifdef FADE
-	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg->page); pdump(spri->page); }
+	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(bg->page); modexpdump(spri->page); }
 	if(IN_KeyDown(22)){
 	paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
 	printf("1paloffset	=	%d\n", paloffset/3);
 	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
 	printf("2paloffset	=	%d\n", paloffset/3);
-	 pdump(bg->page); pdump(spri->page); }
+	 modexpdump(bg->page); modexpdump(spri->page); }
 #endif
 #endif
 	//pan switch