intro screen stuff added from wolf 3d. i am far too busy to code again. there is...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index efa76b750ec441f5d099d8226222657f8d381f03..93afc85618a66527029a27b336f5493697c79742 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_Mouse//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
@@ -337,6 +342,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