X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fxcroll.c;h=52d9b5b9143022c72bb2d9ee00ebb2fef13bf296;hb=fe83dc972e62ab0db157d5a953db2f5236876d67;hp=e31ff558c51125bcf315ccce367c9905bea395db;hpb=0e305ed530c51bad26fa3048c8e1c138d547d946;p=16.git

diff --git a/src/xcroll.c b/src/xcroll.c
index e31ff558..52d9b5b9 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,7 +22,12 @@
 
 #include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
-#include "src/lib/16_dbg.h"
+//#include "src/lib/16_dbg.h"
+
+#ifdef __DEBUG__
+boolean
+	dbg_nointest=1;
+#endif
 
 #define FADE
 //#define NOMAPLOAD
@@ -40,13 +45,14 @@ unsigned int i;
 //static word paloffset=0;
 #endif
 byte *ptr;
-memptr pal;
+//memptr pal;
+boolean spriteswitch=0;
 
 #define FILENAME_1	"data/spri/chikyuu.vrs"
 #define FILENAME_1P	"data/spri/chikyuu.pal"
 #define FILENAME_2	"data/spri/me.vrs"
 #define FILENAME_2P	"data/spri/me.pal"
-#define FILENAME_3	"data/spri/chistnd.vrl"
+//#define FILENAME_3	"data/spri/chistnd.vrl"
 
 void main(int argc, char *argv[])
 {
@@ -57,7 +63,7 @@ void main(int argc, char *argv[])
 
 	char bakapee[64] = FILENAME_1;
 	char bakapeep[64] = FILENAME_1P;
-	char bakapee3[64] = FILENAME_3;
+//	char bakapee3[64] = FILENAME_3;
 
 	Startup16(&gvar);
 
@@ -86,7 +92,6 @@ void main(int argc, char *argv[])
 #endif
 	// data
 	VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);
-//	VRS_LoadVRS(bakapee3, &enti, &gvar);
 
 	// input!
 	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
@@ -135,7 +140,7 @@ 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(&gvar.mv, 0, 0);
 
-	ZC_PlayerXYpos(0, 0, &gvar.player, &gvar.mv, 0, 1);
+	ZC_PlayerXYpos(0, 0, &gvar.player[0], &gvar.mv, 1);
 	EN_initPlayer(&gvar.player[0], &gvar.video);
 	//print_anim_ids(gvar.player[0].enti.spri);
 	if (gvar.video.sprifilei == -1)
@@ -153,6 +158,10 @@ void main(int argc, char *argv[])
 	gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
 	gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
 
+#ifdef OLDWALKSHOWPAGESTUFF
+	VL_ShowPage(&(gvar.video.page[gvar.video.sp]), gvar.kurokku.fpscap, 0);
+#endif
+
 	shinku(&gvar);
 //modexpdump(gvar.mv[0].page);
 #ifdef FADE
@@ -171,7 +180,8 @@ void main(int argc, char *argv[])
 		IN_ReadControl(&gvar.player[0], &gvar);
 		if(!panswitch){
 			//ZC_walk2(gvar.player[0].ent, mv);
-			ZC_walk(&gvar.mv, &gvar.player, 0);
+			//ZC_walk(&gvar.mv, &gvar.player, 0);
+			ZC_walk(&gvar, 0);
 		}else{
 			TAIL_PANKEYFUNZC;
 			//printf("	gvar.player[0].enti.q: %d", gvar.player[0].enti.q);	printf("	gvar.player[0].d: %d\n", gvar.player[0].d);
@@ -190,17 +200,15 @@ void main(int argc, char *argv[])
 		}
 		if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }
 		//debugging binds!
-
-		if(gvar.in.inst->Keyboard[24]){ VL_modexPalScramble(&gvar.video.palette); /*paloffset=0;*/ VL_LoadPalFileCore(&gvar.video.palette, &gvar); modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o
+//		if(gvar.in.inst->Keyboard[24]){ VL_modexPalScramble(&gvar.video.palette); /*paloffset=0;*/ VL_LoadPalFileCore(&gvar.video.palette, &gvar); modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o
 		if(gvar.in.inst->Keyboard[22]){ VL_modexPalScramble(&gvar.video.palette); VL_LoadPalFileCore(&gvar.video.palette, &gvar); } //u
 
 		TAIL_FUNCTIONKEYFUNCTIONS
 		TAIL_FUNCTIONKEYDRAWJUNK
 		if(gvar.in.inst->Keyboard[sc_L]){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }
-		if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar);								IN_UserInput(1, &gvar); }
 
 //===============================================================================
-
+#if 0
 		if(gvar.in.inst->Keyboard[sc_BackSlash]){
 			VRS_ReadVRL(bakapee3, &gvar.player[0].enti, &gvar);
 			DrawVRL(
@@ -213,33 +221,39 @@ void main(int argc, char *argv[])
 			);	while (!IN_CheckAck (&gvar)){}
 			VRS_ReadVRS(bakapee, &gvar.player[0].enti, &gvar);
 		IN_UserInput(1, &gvar); }
-
+#endif
 //===============================================================================
 
-		if(gvar.in.inst->Keyboard[sc_J] || gvar.in.inst->Keyboard[sc_K])
+		if(gvar.in.inst->Keyboard[sc_J])// || gvar.in.inst->Keyboard[sc_K])
 		{
-			if(gvar.in.inst->Keyboard[sc_J])
+			if(spriteswitch)//gvar.in.inst->Keyboard[sc_J])
 			{
 				strcpy(bakapee, FILENAME_1);
 				strcpy(bakapeep, FILENAME_1P);
 				gvar.player[0].enti.overdraww=0;
 			}
-			if(gvar.in.inst->Keyboard[sc_K])
+			else//if(gvar.in.inst->Keyboard[sc_K])
 			{
 				strcpy(bakapee, FILENAME_2);
 				strcpy(bakapeep, FILENAME_2P);
 				gvar.player[0].enti.overdraww=2;
 			}
+			spriteswitch=!spriteswitch;
+
 			//read_vrs(&gvar, bakapee, gvar.player[0].enti.spri->spritesheet);
 			VRS_ReadVRS(bakapee, &gvar.player[0].enti, &gvar);
 			VL_LoadPalFile(bakapeep, &gvar.video.palette, &gvar);
+			ZC_animatePlayer(&gvar.mv, &gvar.player, 0);
+			IN_UserInput(1, &gvar);
 		}//JK
-#ifdef FADE
-		if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
-#endif
-		if(gvar.in.inst->Keyboard[sc_R]){ modexPalOverscan(rand()%56); } //r
+//#ifdef FADE
+//		if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
+//#endif
+		if(gvar.in.inst->Keyboard[sc_R]){ VL_modexPalOverscan(&gvar.video.palette, rand()%32); } //r
+
 
-		if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit (&gvar, "PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
+		//if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit (&gvar, "PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
+		ZC_GirdChk(&gvar, &gvar.player[0]);
 	}
 
 	/* fade back to text mode */