tired i will work on joy stick stuff later

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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 8978a759fe2ae585eda424ce377985147c47a335..84100aeca43b7ff5f02bc0fcac332a4c0e8de83c 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -33,8 +33,8 @@
 #include <string.h>\r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_timer.h"\r
-#ifdef __WATCOMC__     //borland C BCEXMM.EXE\r
 #include "src/lib/16_dbg.h"\r
+#ifdef __WATCOMC__     //borland C BCEXMM.EXE\r
 #include "src/lib/16_spri.h"\r
 #include "src/lib/16_enti.h"\r
 #endif\r
@@ -138,13 +138,18 @@
 #define        key_LSuper                      0x5b\r
 #define        key_RSuper                      0x5c\r
 #define        key_Menu                        0x5d\r
+#define        sc_LBrkt                0x1a    //      [\r
+#define        sc_RBrkt                0x1b    //      ]\r
+#define        sc_BackSlash    0x2b    //      |\r
+#define        sc_ForeSlash    0x35    //      / ?\r
 \r
 //     Stuff for the mouse\r
-#define        MReset          0\r
+//moved to 16_tdef.h\r
+/*#define      MReset          0\r
 #define        MButtons        3\r
 #define        MDelta          11\r
 \r
-#define        MouseInt        0x33\r
+#define        MouseInt        0x33*/\r
 #ifdef DEMO0\r
 typedef        enum            {\r
                                                demo_Off,demo_Record,demo_Playback,demo_PlayDone\r
@@ -213,34 +218,34 @@ typedef   struct          {
 #endif\r
 \r
 //     Internal routines\r
-extern void            IN_Startup(void),IN_Shutdown(void),\r
-                                       IN_Default(boolean gotit,player_t *player,ControlType nt),\r
+extern void            IN_Startup(global_game_variables_t *gvar),IN_Shutdown(global_game_variables_t *gvar),\r
+                                       IN_Default(boolean gotit,player_t *player,ControlType nt, global_game_variables_t *gvar),\r
                                        IN_SetKeyHook(void (*)()),\r
                                        IN_ClearKeysDown(void),\r
-                                       IN_ReadCursor(CursorInfo *),\r
-                                       IN_ReadControl(player_t *player),\r
+                                       IN_ReadCursor(CursorInfo *, global_game_variables_t *gvar),\r
+                                       IN_ReadControl(player_t *player, global_game_variables_t *gvar),\r
                                        IN_SetControlType(player_t *player,ControlType type),\r
                                        IN_GetJoyAbs(word joy,word *xp,word *yp),\r
                                        IN_SetupJoy(word joy,word minx,word maxx,\r
-                                                               word miny,word maxy),\r
+                                                               word miny,word maxy, global_game_variables_t *gvar),\r
 #if DEMO0\r
                                        IN_StopDemo(void),IN_FreeDemoBuffer(void),\r
 #endif\r
-                                       IN_Ack(void),IN_AckBack(void);\r
-extern boolean         IN_UserInput(word delay);\r
+                                       IN_Ack(global_game_variables_t *gvar),IN_AckBack(void);\r
+extern boolean         IN_UserInput(word delay, global_game_variables_t *gvar);\r
 extern char            IN_WaitForASCII(void);\r
 extern ScanCode        IN_WaitForKey(void);\r
 extern word            IN_GetJoyButtonsDB(word joy);\r
 extern byte            *IN_GetScanName(ScanCode);\r
 \r
 \r
-byte   IN_MouseButtons (void);\r
+byte   IN_MouseButtons (global_game_variables_t *gvar);\r
 byte   IN_JoyButtons (void);\r
 \r
-void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/);\r
-void IN_StartAck(void);\r
-boolean IN_CheckAck (void);\r
-boolean IN_IsUserInput();\r
+void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/, global_game_variables_t *gvar);\r
+void IN_StartAck(global_game_variables_t *gvar);\r
+boolean IN_CheckAck (global_game_variables_t *gvar);\r
+boolean IN_IsUserInput(global_game_variables_t *gvar);\r
 #define Mouse(x)         INL_Mouse(x)\r
 //void IN_SetKeyHook(void (*hook)());\r
 #if DEMO0\r
@@ -250,8 +255,8 @@ void IN_StopDemo(void);
 void IN_FreeDemoBuffer(void);\r
 #endif\r
 \r
-boolean        IN_KeyDown(byte code),\r
-               IN_qb(byte kee);\r
+//boolean      IN_KeyDown(byte code),\r
+//             IN_qb(byte kee);\r
 void           IN_ClearKey(byte code),\r
                IN_KbdLED();\r
 ScanCode       IN_GetLastScan(),\r