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 efa76b750ec441f5d099d8226222657f8d381f03..cbbabea946049750bd2f0738fa800017f415fecc 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -24,13 +24,17 @@
 #include "src/lib/16_timer.h"\r
 //#include "src/lib/16_dbg.h"\r
 \r
-#define FADE\r
+//#define FADE\r
+\r
 //#define NOMAPLOAD\r
 //#define OLDPLAYERSPRITESTUFF\r
+#define XC_CTRLTYPE ctrl_Joystick1//ctrl_Mouse//ctrl_Keyboard\r
+//Mouse\r
 #ifdef __DEBUG__\r
 #define SCROLLEXEDEBUG\r
 boolean\r
-       dbg_nointest=1;\r
+       dbg_nointest=0,\r
+       dbg_joymousedelta=0;\r
 #endif\r
 \r
 //static map_t map;\r
@@ -132,7 +136,8 @@ void main(int argc, char *argv[])
 #endif\r
 \r
        // input!\r
-       IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
+       IN_Default(0, &gvar.player[0],XC_CTRLTYPE, &gvar);\r
+       IN_SetControlType(&gvar.player[0],XC_CTRLTYPE);\r
 \r
        // save the palette\r
 #ifdef FADE\r
@@ -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); }\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
@@ -337,6 +343,16 @@ void main(int argc, char *argv[])
 #endif\r
 }\r
 \r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
 #ifdef OLDPLAYERSPRITESTUFF\r
 void\r
 modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {\r