X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fzcroll.c;h=9b6ba75f2f8c2072360d0e2e59552d0a698e27ad;hb=ffbad4972c8eed182edd7c0ba1fef0bc1d457bf2;hp=8c148d9c6d08f007850bc88ad340fe131a490114;hpb=685a965bc64a6971eecd1d61f8cad606b5f0ac02;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index 8c148d9c..9b6ba75f 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -127,28 +127,22 @@ void main(int argc, char *argv[])
 	//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
 	mapGoTo(&mv, 0, 0);
 
-	ZC_playerXYpos(0, 0, &player, &mv, 0);
+	ZC_playerXYpos(0, 0, &player, &mv, 0, 1);
 	EN_initplayer(&player, 0, &gvar.video);
-	player[0].enti.spri->x = player[0].enti.x-4;
-	player[0].enti.spri->y = player[0].enti.y-16;
-
-	player[0].enti.dire=31;
-	gvar.video.sprifilei = set_anim_by_id(player[0].enti.spri, player[0].enti.dire);
 	//print_anim_ids(player[0].enti.spri);
 	if (gvar.video.sprifilei == -1)
 	{
 #ifdef FADE
 		modexFadeOff(4, gpal);
 #endif
-		Quit(&gvar, "Wrong");
+		Quit(&gvar, "Wrong ID for sprite");
 #ifdef FADE
 		modexFadeOn(4, dpal);
 #endif
 	}
 
 //	while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }
-	VL_ShowPage(mv[0].page, 0, 0);
-	animate_spri(&(player[0].enti), &gvar.video);
+	shinku(&gvar);
 #ifdef FADE
 	modexFadeOn(4, gpal);
 #endif
@@ -186,22 +180,6 @@ void main(int argc, char *argv[])
 		if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o
 		if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u
 
-		//pan switch
-		if(IN_KeyDown(66))	//f8
-		{
-//			modexDrawSprite(mv[0].page, 16, 16, &p);
-//			modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));
-			switch(i)
-			{
-				case 11:
-					i=0;
-					player[0].enti.spri->x = TILEWH;
-				default:
-					i++;
-					animate_spri(&(player[0].enti), &gvar.video);// player[0].enti.spri->x += 16;
-				break;
-			}
-		}
 		FUNCTIONKEYFUNCTIONS
 		FUNCTIONKEYDRAWJUNK
 		if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }
@@ -211,13 +189,13 @@ void main(int argc, char *argv[])
 			{
 				bakapee1=FILENAME_1;
 				bakapee1p=FILENAME_1P;
-				enti->overdraww=0;
+				player[0].enti.overdraww=0;
 			}
 			if(IN_KeyDown(sc_K))
 			{
 				bakapee1=FILENAME_2;
 				bakapee1p=FILENAME_2P;
-				enti->overdraww=2;
+				player[0].enti.overdraww=2;
 			}
 			//read_vrs(&gvar, bakapee1, player[0].enti.spri->spritesheet);
 			VRS_ReadVRS(bakapee1, &player[0].enti, &gvar);
@@ -228,7 +206,7 @@ void main(int argc, char *argv[])
 #endif
 		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
 
-		if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) break;	//incase things go out of sync!
+		if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */
@@ -238,7 +216,6 @@ void main(int argc, char *argv[])
 	modexSavePalFile("data/g.pal", gpal);
 	modexFadeOff(4, gpal);
 #endif
-	VGAmodeX(0, 1, &gvar);
 	Shutdown16(&gvar);
 	printf("\nProject 16 zcroll.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);