corepal variable added and i need to find out how to get the joystick input correct...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index 93afc85618a66527029a27b336f5493697c79742..cbbabea946049750bd2f0738fa800017f415fecc 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -28,7 +28,7 @@
 \r
 //#define NOMAPLOAD\r
 //#define OLDPLAYERSPRITESTUFF\r
-#define XC_CTRLTYPE ctrl_Mouse//Keyboard\r
+#define XC_CTRLTYPE ctrl_Joystick1//ctrl_Mouse//ctrl_Keyboard\r
 //Mouse\r
 #ifdef __DEBUG__\r
 #define SCROLLEXEDEBUG\r
@@ -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); }\r
 //#endif\r
                if(gvar.in.inst->Keyboard[sc_R]){ VL_modexPalOverscan(&gvar.video.palette, rand()%32); } //r\r
+               if(gvar.in.inst->Keyboard[sc_F]){ VL_SetPalette(&gamepal, &gvar.video); } //f\r
 \r
 \r
                //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!\r