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

diff --git a/src/xcroll.c b/src/xcroll.c
index efa76b75..3f097a3c 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -24,13 +24,17 @@
 #include "src/lib/16_timer.h"
 //#include "src/lib/16_dbg.h"
 
-#define FADE
+//#define FADE
+
 //#define NOMAPLOAD
 //#define OLDPLAYERSPRITESTUFF
+#define XC_CTRLTYPE ctrl_Keyboard
+//Mouse
 #ifdef __DEBUG__
 #define SCROLLEXEDEBUG
 boolean
-	dbg_nointest=1;
+	dbg_nointest=0,
+	dbg_joymousedelta=0;
 #endif
 
 //static map_t map;
@@ -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
@@ -337,6 +342,16 @@ void main(int argc, char *argv[])
 #endif
 }
 
+
+
+
+
+
+
+
+
+
+
 #ifdef OLDPLAYERSPRITESTUFF
 void
 modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {