X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fxcroll.c;h=ef1d11ede98961b7f3fa501906e47ac4f9075dd2;hb=2f706222157c9d186db8adf361542bb76ba259c6;hp=20a50904ea99b91b89bd141ef397925db7404baa;hpb=d1d13aabf788ad913a722658789db147f30767a2;p=16.git

diff --git a/src/xcroll.c b/src/xcroll.c
index 20a50904..ef1d11ed 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,8 +68,6 @@ void main(int argc, char *argv[])
 	Startup16(&gvar);
 
 	ggvv=&gvar;
-	// input!
-	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
 
 	if (argc >= 2) {
 		if(argv[1]){ strcpy(bakapee, argv[1]);
@@ -78,40 +79,22 @@ 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");
-	IN_StartAck (&gvar);	while (!IN_CheckAck (&gvar)){}
-		#endif
+	// input!
+	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
 
 	// save the palette
 #ifdef FADE
@@ -131,9 +114,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 +122,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);