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 01d7ec1ca41a9eca4e989dad3b1a9371723bc642..84100aeca43b7ff5f02bc0fcac332a4c0e8de83c 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -144,11 +144,12 @@
 #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
@@ -224,7 +225,7 @@ extern      void            IN_Startup(global_game_variables_t *gvar),IN_Shutdown(global_game_v
                                        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 __far*xp,word __far*yp),\r
+                                       IN_GetJoyAbs(word joy,word *xp,word *yp),\r
                                        IN_SetupJoy(word joy,word minx,word maxx,\r
                                                                word miny,word maxy, global_game_variables_t *gvar),\r
 #if DEMO0\r
@@ -241,7 +242,7 @@ extern      byte            *IN_GetScanName(ScanCode);
 byte   IN_MouseButtons (global_game_variables_t *gvar);\r
 byte   IN_JoyButtons (void);\r
 \r
-void INL_GetJoyDelta(word joy,int __far*dx,int __far*dy/*,boolean adaptive*/, global_game_variables_t *gvar);\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