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

diff --git a/src/xcroll.c b/src/xcroll.c
index 816c600e..3126f7da 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,15 +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 FADE
 //#define NOMAPLOAD
 //#define OLDPLAYERSPRITESTUFF
+#define XC_CTRLTYPE ctrl_Joystick1//ctrl_Mouse//ctrl_Keyboard
 #ifdef __DEBUG__
-//#define SCROLLEXEDEBUG
-boolean
-	dbg_nointest=1;
+#define SCROLLEXEDEBUG
 #endif
 
 //static map_t map;
@@ -79,6 +79,10 @@ void main(int argc, char *argv[])
 	char bakapee[64] = FILENAME_1;
 	char bakapeep[64] = FILENAME_1P;
 //	char bakapee3[64] = FILENAME_3;
+#ifdef __DEBUG__
+	dbg_nointest=0;
+	dbg_joymousedelta=0;
+#endif
 
 	Startup16(&gvar);
 
@@ -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
@@ -307,6 +315,7 @@ void main(int argc, char *argv[])
 //		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.in.inst->Keyboard[sc_F]){ VL_SetPalette(&gamepal, &gvar.video); } //f
 
 
 		//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!
@@ -334,6 +343,16 @@ void main(int argc, char *argv[])
 #endif
 }
 
+
+
+
+
+
+
+
+
+
+
 #ifdef OLDPLAYERSPRITESTUFF
 void
 modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {