wwww inputtest works good~

	modified:   16.LIB
	modified:   inputest.exe
	modified:   src/inputest.c
	modified:   src/lib/16_in.c
	modified:   src/lib/16_in.h

diff --git a/16.LIB b/16.LIB
index 266271d9885120353d2fc3f383cb8f9d8a046de1..56c3dbd4ad0f33c5bc1847ef8351d68543fe7d80 100644 (file)
Binary files a/16.LIB and b/16.LIB differ

diff --git a/inputest.exe b/inputest.exe
index 91329f9cd34490015f1e145e40c71f670ff06541..0ac3e6a6f5e7ff5650095de2c7e42cf7eb82c557 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/src/inputest.c b/src/inputest.c
index 98815cc6ca5a42134a623a98ad3626b03a3ae920..5df1f39f8acd33569de7ecf77655fff72387d990 100644 (file)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -28,6 +28,7 @@ void
 main(int argc, char *argv[])\r
 {
        player_t player[MaxPlayers];
+       //extern struct inconfig inpu;
 \r
        IN_Startup();
        IN_Default(0,&player,ctrl_Joystick);\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 6d8c1aba9c76e1176e5038574645904547a02653..55afb2113ba37fa7b2d1737095b0abdc2ebceaac 100644 (file)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -60,8 +60,6 @@ struct inconfig
        JoypadDef       JoypadDefs[MaxPads];
 } inpu;
 
-//struct inconfig in;
-
 //inpu.KbdDefs = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/};
 
 /*\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 352d87b27974c1c9fee96dd28a1ef1cb7ccf49c5..410831addc044cbf6c236aa3b6ed848ff88e802a 100644 (file)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -208,13 +208,34 @@ typedef   struct
        ControlType     Controls;
 } player_t;
 
+/*\r
+=============================================================================\r
+\r
+                                       GLOBAL VARIABLES\r
+\r
+=============================================================================\r
+*/
+/*extern struct inconfig
+{
+       boolean                 MousePresent;\r
+       boolean                 JoysPresent[MaxJoys];\r
+       boolean                 JoyPadPresent[MaxPads];
+       boolean         Keyboard[NumCodes];\r
+       boolean         Paused;\r
+       char            LastASCII;\r
+       ScanCode        LastScan;
+
+       KeyboardDef     KbdDefs[MaxKbds];
+       JoystickDef     JoyDefs[MaxJoys];
+       JoypadDef       JoypadDefs[MaxPads];
+} inpu;*/
+
 #ifdef DEMO0\r
                static Demo             DemoMode = demo_Off;\r
                static byte /*_seg*/    *DemoBuffer;\r
                static word             DemoOffset,DemoSize;\r
 #endif\r
 
-//extern struct inconfig in;
 extern dword far* clockdw;\r
 \r
 //     Internal routines