X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in_.h;h=f84b3a467007fba1877cb821e0426f547b8f116a;hb=f99bde8f168f1af79c556eb3b88bade0665a2219;hp=969fdb7e07f0d2eefbefdca531a2b79051a0c1ce;hpb=c421d6353c601dc59f7d9e42883f0711c6a89805;p=16.git

diff --git a/src/lib/16_in_.h b/src/lib/16_in_.h
index 969fdb7e..f84b3a46 100755
--- a/src/lib/16_in_.h
+++ b/src/lib/16_in_.h
@@ -202,7 +202,7 @@ typedef	struct		{
 									joyMaxX,joyMaxY,
 									joyMultXL,joyMultYL,
 									joyMultXH,joyMultYH;
-					} JoystickDef;
+					} JoystickDef;*/
 
 /*
 =============================================================================
@@ -218,48 +218,48 @@ typedef	struct		{
 #endif
 
 //	Internal routines
-extern void interrupt INL_KeyService();
-extern void Mouse(int x);
+//void interrupt INL_KeyService(global_game_variables_t *gvar);
+void Mouse(int x);
 //static void INL_GetMouseDelta(int *x,int *y);
 //static word INL_GetMouseButtons(void);
-extern void IN_GetJoyAbs(word joy,word *xp,word *yp);
+void IN_GetJoyAbs(word joy,word *xp,word *yp);
 //static void INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive);
 //static word INL_GetJoyButtons(word joy);
-extern word IN_GetJoyButtonsDB(word joy);
+word IN_GetJoyButtonsDB(word joy, global_game_variables_t *gvar);
 //static void INL_StartKbd(void);
 //static void INL_ShutKbd(void);
 //static boolean INL_StartMouse(void);
 //static void INL_ShutMouse(void);
 //static void INL_SetJoyScale(word joy);
-extern void IN_SetupJoy(word joy,word minx,word maxx,word miny,word maxy);
+void IN_SetupJoy(word joy,word minx,word maxx,word miny,word maxy, global_game_variables_t *gvar);
 //static boolean INL_StartJoy(word joy);
 //static void INL_ShutJoy(word joy);
-extern void IN_Startup();
-extern void IN_Default(boolean gotit,player_t *player,ControlType nt);
-extern void IN_Shutdown();
-extern void IN_SetKeyHook(void (*hook)());
-extern void IN_ClearKeysDown();
+void IN_Startup(global_game_variables_t *gvar);
+void IN_Default(boolean gotit,player_t *player,ControlType nt, global_game_variables_t *gvar);
+void IN_Shutdown(global_game_variables_t *gvar);
+void IN_SetKeyHook(void (*hook)());
+void IN_ClearKeysDown(global_game_variables_t *gvar);
 //static void INL_AdjustCursor(CursorInfo *info,word buttons,int dx,int dy);
-extern void IN_ReadCursor(CursorInfo *info);
-extern void near IN_ReadControl(word pn, player_t *player);
-extern void IN_SetControlType(word pn,player_t *player,ControlType type);
+void IN_ReadCursor(CursorInfo *info, global_game_variables_t *gvar);
+void near IN_ReadControl(word pn, player_t *player, global_game_variables_t *gvar);
+void IN_SetControlType(word pn,player_t *player,ControlType type);
 #if DEMO0
-extern boolean IN_StartDemoRecord(word bufsize);
-extern void IN_StartDemoPlayback(byte /*__segment*/ *buffer,word bufsize);
-extern void IN_StopDemo(void);
-extern void IN_FreeDemoBuffer(void);
+boolean IN_StartDemoRecord(word bufsize);
+void IN_StartDemoPlayback(byte /*__segment*/ *buffer,word bufsize);
+void IN_StopDemo(void);
+void IN_FreeDemoBuffer(void);
 #endif
-extern byte *IN_GetScanName(ScanCode scan);
-extern ScanCode IN_WaitForKey();
-extern char IN_WaitForASCII();
-extern void IN_AckBack();
-extern void IN_Ack();
-extern boolean IN_IsUserInput();
-extern boolean IN_UserInput(dword delay,boolean clear);
-extern boolean IN_KeyDown(byte code);
-extern void IN_ClearKey(byte code);
-extern boolean IN_qb(byte kee);
-extern ScanCode IN_GetLastScan();
-extern ScanCode IN_GetCurCode();
+byte *IN_GetScanName(ScanCode scan);
+ScanCode IN_WaitForKey(global_game_variables_t *gvar);
+char IN_WaitForASCII(global_game_variables_t *gvar);
+void IN_AckBack(global_game_variables_t *gvar);
+void IN_Ack(global_game_variables_t *gvar);
+boolean IN_IsUserInput(global_game_variables_t *gvar);
+boolean IN_UserInput(dword delay,boolean clear, global_game_variables_t *gvar);
+boolean IN_KeyDown(byte code, global_game_variables_t *gvar);
+void IN_ClearKey(byte code, global_game_variables_t *gvar);
+boolean IN_qb(byte kee, global_game_variables_t *gvar);
+ScanCode IN_GetLastScan(global_game_variables_t *gvar);
+ScanCode IN_GetCurCode(global_game_variables_t *gvar);
 
 #endif