modified: src/lib/16_in.c

[16.git] / src / lib / 16_in.h

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index b39e1a5ba7f9c06a9f2b0e6e389b6567307ee5b1..9aaf3456fc72b33bea5906740847d2250b273b70 100644 (file)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -19,13 +19,15 @@
 //\r
 //     ID Engine\r
 //     ID_IN.h - Header file for Input Manager\r
-//     v1.0d1\r
-//     By Jason Blochowiak\r
+//     v1.0d1w\r
+//     By Jason Blochowiak
+// Open Watcom port by sparky4\r
 //\r
 \r
 #ifndef        __16_IN__\r
 #define        __16_IN__\r
-\r
+
+#include <string.h>\r
 #include "src/lib/lib_head.h"\r
 //#include "src/lib/16_us.h"\r
 \r
@@ -33,8 +35,9 @@
 #define        __DEBUG_InputMgr__\r
 //++++#endif\r
 \r
-//#define DOMO\r
-#define TESTKEYIN\r
+//#define DUMU\r
+#define TESTKEYIN
+#define TESTCONTROLNOISY\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
 \r
@@ -131,6 +134,10 @@ typedef    byte            ScanCode;
 #define        key_BackSpace   0x08\r
 #define        key_Tab                 0x09\r
 #define        key_Delete              0x7f\r
+
+#define        key_LSuper                      0x5b
+#define        key_RSuper                      0x5c
+#define        key_Menu                        0x5d
 \r
 //     Stuff for the mouse\r
 #define        MReset          0\r
@@ -205,21 +212,21 @@ static boolean                    MousePresent;
 static boolean                 JoysPresent[MaxJoys];\r
 static boolean                 JoyPadPresent;\r
 \r
-\r
 //     Global variables\r
-               static boolean JoystickCalibrated=false;                // MDM (GAMERS EDGE) - added\r
-               static ControlType ControlTypeUsed;                             // MDM (GAMERS EDGE) - added\r
+               extern boolean JoystickCalibrated;              // MDM (GAMERS EDGE) - added\r
+               extern ControlType ControlTypeUsed;                             // MDM (GAMERS EDGE) - added\r
 \r
-               static boolean          Keyboard[NumCodes];\r
-               static boolean          Paused;\r
-               static char             LastASCII;\r
-               static ScanCode LastScan;\r
+               extern boolean          Keyboard[NumCodes];\r
+               extern boolean          Paused;\r
+               extern char             LastASCII;\r
+               extern ScanCode LastScan;\r
 \r
+               //extern KeyboardDef    KbdDefs[];
                static KeyboardDef      KbdDefs[] = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};\r
-               static JoystickDef      JoyDefs[MaxJoys];\r
-               static ControlType      Controls[MaxPlayers];\r
+               extern JoystickDef      JoyDefs[MaxJoys];\r
+               extern ControlType      Controls[MaxPlayers];\r
 \r
-               static dword    MouseDownCount;\r
+               extern dword    MouseDownCount;\r
 \r
 #ifdef DEMO0\r
                static Demo             DemoMode = demo_Off;\r
@@ -291,7 +298,7 @@ static      Direction       DirTable[] =            // Quick lookup for total direction
 static void                    (*INL_KeyHook)(void);\r
 static void interrupt  (*OldKeyVect)(void);\r
 \r
-static char                    *ParmStrings[] = {"nojoys","nomouse",nil};\r
+static char                    *ParmStringsIN[] = {"nojoys","nomouse",nil};\r
 \r
 // Function prototypes\r
 #define        IN_KeyDown(code)        (Keyboard[(code)])\r