X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fxcroll.c;h=e72af2ff57843ff44f993a0c46b8a9011c830c9c;hb=5c3da8981be76348ea34711b6297c0d2d3ed19ab;hp=efa76b750ec441f5d099d8226222657f8d381f03;hpb=7f33f5e74cc6486faa7182f3a12f214180e118fd;p=16.git

diff --git a/src/xcroll.c b/src/xcroll.c
index efa76b75..e72af2ff 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_Keyboard//ctrl_Joystick1//ctrl_Mouse
 #ifdef __DEBUG__
 #define SCROLLEXEDEBUG
-boolean
-	dbg_nointest=1;
 #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);
 
@@ -132,7 +136,8 @@ void main(int argc, char *argv[])
 #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
@@ -310,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!
@@ -337,6 +343,16 @@ void main(int argc, char *argv[])
 #endif
 }
 
+
+
+
+
+
+
+
+
+
+
 #ifdef OLDPLAYERSPRITESTUFF
 void
 modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {