X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fxcroll.c;h=93afc85618a66527029a27b336f5493697c79742;hb=6cb7af40446a399db9f56ba66d8db74a1a1f3181;hp=816c600e4689e587db7958470d419f53617acc59;hpb=8c5ce6d6e768ba3dfac7f4e2e95d68152ab42aaa;p=16.git

diff --git a/src/xcroll.c b/src/xcroll.c
index 816c600e..93afc856 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -24,13 +24,17 @@
 #include "src/lib/16_timer.h"
 //#include "src/lib/16_dbg.h"
 
-#define FADE
+//#define FADE
+
 //#define NOMAPLOAD
 //#define OLDPLAYERSPRITESTUFF
+#define XC_CTRLTYPE ctrl_Mouse//Keyboard
+//Mouse
 #ifdef __DEBUG__
-//#define SCROLLEXEDEBUG
+#define SCROLLEXEDEBUG
 boolean
-	dbg_nointest=1;
+	dbg_nointest=0,
+	dbg_joymousedelta=0;
 #endif
 
 //static map_t map;
@@ -95,11 +99,12 @@ void main(int argc, char *argv[])
 
 	// create the map
 		#ifdef SCROLLEXEDEBUG
-	strcpy(gvar.handle.datadumpfilename, "xcroll1.16w");	MM_DumpData (&gvar);
+	//strcpy(gvar.handle.datadumpfilename, "mmdump1.16w");	MM_DumpData (&gvar);
+	//strcpy(gvar.handle.heapdumpfilename, "heap1.16w");		HC_heapdump(&gvar);
 	//fprintf(stderr, "testing map load~	");
 		#endif
-	CA_loadmap("data/test.map", &gvar.map, &gvar);
 #ifndef NOMAPLOAD
+	CA_loadmap("data/test.map", &gvar.map, &gvar);
 	chkmap(&gvar.map, 0);
 #else
 	chkmap(&gvar.map, 1);
@@ -108,7 +113,8 @@ void main(int argc, char *argv[])
 		#ifdef SCROLLEXEDEBUG
 	printf("chkmap ok\n");
 //	fprintf(stderr, "yay map loaded~~\n");
-	strcpy(gvar.handle.datadumpfilename, "xcroll2.16w");	MM_DumpData (&gvar);
+	//strcpy(gvar.handle.datadumpfilename, "mmdump2.16w");	MM_DumpData (&gvar);
+	//strcpy(gvar.handle.heapdumpfilename, "heap2.16w");		HC_heapdump(&gvar);
 		#endif
 
 	// data
@@ -118,18 +124,20 @@ void main(int argc, char *argv[])
 #else
 		#ifdef SCROLLEXEDEBUG
 	fprintf(stderr, "VRS_LoadVRS~	");
-	strcpy(gvar.handle.datadumpfilename, "xcroll3.16w");	MM_DumpData (&gvar);
+	//strcpy(gvar.handle.datadumpfilename, "mmdump3.16w");	MM_DumpData (&gvar);
+	//strcpy(gvar.handle.heapdumpfilename, "heap3.16w");		HC_heapdump(&gvar);
 		#endif
 	VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);
 		#ifdef SCROLLEXEDEBUG
 	printf("VRS load OK~\n");
-	strcpy(gvar.handle.datadumpfilename, "xcroll4.16w");	MM_DumpData (&gvar);
+	//strcpy(gvar.handle.datadumpfilename, "mmdump4.16w");	MM_DumpData (&gvar);
+	//strcpy(gvar.handle.heapdumpfilename, "heap4.16w");		HC_heapdump(&gvar);
 		#endif
-	strcpy(gvar.handle.datadumpfilename, "xcroll.16w");
 #endif
 
 	// input!
-	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
+	IN_Default(0, &gvar.player[0],XC_CTRLTYPE, &gvar);
+	IN_SetControlType(&gvar.player[0],XC_CTRLTYPE);
 
 	// save the palette
 #ifdef FADE
@@ -334,6 +342,16 @@ void main(int argc, char *argv[])
 #endif
 }
 
+
+
+
+
+
+
+
+
+
+
 #ifdef OLDPLAYERSPRITESTUFF
 void
 modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {