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

diff --git a/src/xcroll.c b/src/xcroll.c
index 3f097a3c..3126f7da 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,19 +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
 //#define OLDPLAYERSPRITESTUFF
-#define XC_CTRLTYPE ctrl_Keyboard
-//Mouse
+#define XC_CTRLTYPE ctrl_Joystick1//ctrl_Mouse//ctrl_Keyboard
 #ifdef __DEBUG__
 #define SCROLLEXEDEBUG
-boolean
-	dbg_nointest=0,
-	dbg_joymousedelta=0;
 #endif
 
 //static map_t map;
@@ -83,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);
 
@@ -315,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!