X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fxcroll.c;h=b9e928430425082927d17516a70e6dfb1f73bf10;hb=8db9019df22bf792ea02096dec8c3d862fa00155;hp=29ef17f4b7537423ab268f0c4bfab65e56d6b2f5;hpb=5d7c5cf6e8af1d1d5181fd9a405bcce5821ffcf0;p=16.git

diff --git a/src/xcroll.c b/src/xcroll.c
index 29ef17f4..b9e92843 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,12 +22,15 @@
 
 #include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
-#include "src/lib/16_dbg.h"
+//#include "src/lib/16_dbg.h"
 
-//#define FADE
-//#define NOMAPLOAD
+#ifdef __DEBUG__
+boolean
+	dbg_nointest=1;
+#endif
 
-//#define VERBOSESCROLL
+#define FADE
+//#define NOMAPLOAD
 
 static map_t map;
 float t;
@@ -65,6 +68,7 @@ void main(int argc, char *argv[])
 	Startup16(&gvar);
 
 	ggvv=&gvar;
+
 	// input!
 	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
 
@@ -78,40 +82,21 @@ void main(int argc, char *argv[])
 	//----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));
 
 	// create the map
-		#ifdef VERBOSESCROLL
-	fprintf(stderr, "testing map load~	");
-		#endif
+//	fprintf(stderr, "testing map load~	");
 	CA_loadmap("data/test.map", &map, &gvar);
 #ifndef NOMAPLOAD
 	chkmap(&map, 0);
 //	initMap(&map);
+//	printf("chkmap ok	");
+//	fprintf(stderr, "yay map loaded~~\n");
 #else
 	chkmap(&map, 1);
 	//initMap(&map);
 #endif
-		#ifdef VERBOSESCROLL
-	fprintf(stderr, "chkmap ok	");
-	fprintf(stderr, "yay map loaded~~\n");
-		#endif
-
-		#ifdef VERBOSESCROLL
-	fprintf(stderr, "press a key wwww\n");
-	IN_StartAck (&gvar);	while (!IN_CheckAck (&gvar)){}
-		#endif
-
 	// data
-		#ifdef VERBOSESCROLL
-	fprintf(stderr, "VRS_LoadVRS	");
-		#endif
-	VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);
-		#ifdef VERBOSESCROLL
-	fprintf(stderr, "ok~\n");
-		#endif
-
-		#ifdef VERBOSESCROLL
-	fprintf(stderr, "press a key wwww\n");
+	printf("loading vrs	");
+	VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);	printf("ok\n");
 	IN_StartAck (&gvar);	while (!IN_CheckAck (&gvar)){}
-		#endif
 
 	// save the palette
 #ifdef FADE
@@ -131,9 +116,6 @@ void main(int argc, char *argv[])
 	//printf("1:	%d\n", paloffset);
 	map.tiles->data->offset=(paloffset/3);
 	modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/
-		#ifdef VERBOSESCROLL
-	fprintf(stderr, "VL_LoadPalFile	");
-		#endif
 	VL_LoadPalFile(bakapeep, &gvar.video.palette, &gvar);
 	//VL_LoadPalFile("data/default.pal", &gvar.video.palette);
 
@@ -142,9 +124,6 @@ void main(int argc, char *argv[])
 	modexSavePalFile("data/g.pal", &gvar.video.palette);
 	modexPalBlack();	//so player will not see loadings~
 #endif
-		#ifdef VERBOSESCROLL
-	fprintf(stderr, "ok\n");
-		#endif
 
 	// setup camera and screen~
 	modexHiganbanaPageSetup(&gvar);
@@ -181,6 +160,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
@@ -199,7 +182,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);