wwww

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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 16a6ed84de84df1eb12732541696ed6e65a3d3fb..1e099ee4c591ee310ea6002966829bfb1b8a8d8a 100644 (file)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -27,7 +27,7 @@
 #define        __16_IN__\r
 
 #include "src/lib/lib_head.h"\r
-#include "src/lib/16_us.h"
+//#include "src/lib/16_us.h"
 \r
 #ifdef __DEBUG__\r
 #define        __DEBUG_InputMgr__\r
@@ -135,10 +135,11 @@ typedef   byte            ScanCode;
 #define        MDelta          11\r
 \r
 #define        MouseInt        0x33\r
-\r
+#ifdef DEMO0\r
 typedef        enum            {\r
                                                demo_Off,demo_Record,demo_Playback,demo_PlayDone\r
-                                       } Demo;\r
+                                       } Demo;
+#endif\r
 typedef        enum            {\r
                                                ctrl_None,                              // MDM (GAMERS EDGE) - added\r
                                                ctrl_Keyboard,\r
@@ -180,7 +181,6 @@ typedef     struct          {
                                                                        joyMultXL,joyMultYL,\r
                                                                        joyMultXH,joyMultYH;\r
                                        } JoystickDef;\r
-
 /*\r
 =============================================================================\r
 \r
@@ -192,33 +192,33 @@ typedef   struct          {
 //\r
 // configuration variables\r
 //\r
-boolean                        MousePresent;\r
-boolean                        JoysPresent[MaxJoys];\r
-boolean                        JoyPadPresent;\r
+static boolean                 MousePresent;\r
+static boolean                 JoysPresent[MaxJoys];\r
+static boolean                 JoyPadPresent;\r
 \r
 \r
 //     Global variables
-               boolean JoystickCalibrated=false;               // MDM (GAMERS EDGE) - added
-               ControlType ControlTypeUsed;                            // MDM (GAMERS EDGE) - added
+               static boolean JoystickCalibrated=false;                // MDM (GAMERS EDGE) - added
+               static ControlType ControlTypeUsed;                             // MDM (GAMERS EDGE) - added
 \r
-               boolean         Keyboard[NumCodes];\r
-               boolean         Paused;\r
-               char            LastASCII;\r
-               ScanCode        LastScan;\r
+               static boolean          Keyboard[NumCodes];\r
+               static boolean          Paused;\r
+               static char             LastASCII;\r
+               static ScanCode LastScan;\r
 \r
-               KeyboardDef     KbdDefs[] = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};\r
-               JoystickDef     JoyDefs[MaxJoys];\r
-               ControlType     Controls[MaxPlayers];\r
+               static KeyboardDef      KbdDefs[] = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51};\r
+               static JoystickDef      JoyDefs[MaxJoys];\r
+               static ControlType      Controls[MaxPlayers];\r
 \r
-               dword   MouseDownCount;
+               static dword    MouseDownCount;
 \r
 #ifdef DEMO0\r
-               Demo            DemoMode = demo_Off;\r
-               byte /*_seg*/   *DemoBuffer;\r
-               word            DemoOffset,DemoSize;
+               static Demo             DemoMode = demo_Off;\r
+               static byte /*_seg*/    *DemoBuffer;\r
+               static word             DemoOffset,DemoSize;
 #endif
 
-
+extern dword far* clockdw;
 
 /*\r
 =============================================================================\r
@@ -313,6 +313,5 @@ extern      char            IN_WaitForASCII(void);
 extern ScanCode        IN_WaitForKey(void);\r
 extern word            IN_GetJoyButtonsDB(word joy);
 
-static void interrupt INL_KeyService(void);\r
-\r
+//static void interrupt INL_KeyService(void);\r
 #endif\r