X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=6752c49d12b54b8b4bef5b8b2299ed344fe747b0;hb=3a088e0a4a5306da276a61c89567a48710b1e721;hp=01d7ec1ca41a9eca4e989dad3b1a9371723bc642;hpb=40f6a462ab3580c79bc91e86da49fa5ed37a853c;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 01d7ec1c..6752c49d 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -144,11 +144,14 @@
 #define	sc_ForeSlash	0x35	//	/ ?
 
 // 	Stuff for the mouse
-#define	MReset		0
+//moved to 16_tdef.h
+/*#define	MReset		0
 #define	MButtons	3
 #define	MDelta		11
 
-#define	MouseInt	0x33
+#define	MouseInt	0x33*/
+#define	Mouse(x)	_AX = x,geninterrupt(MouseInt)
+
 #ifdef DEMO0
 typedef	enum		{
 						demo_Off,demo_Record,demo_Playback,demo_PlayDone
@@ -224,7 +227,7 @@ extern	void		IN_Startup(global_game_variables_t *gvar),IN_Shutdown(global_game_v
 					IN_ReadCursor(CursorInfo *, global_game_variables_t *gvar),
 					IN_ReadControl(player_t *player, global_game_variables_t *gvar),
 					IN_SetControlType(player_t *player,ControlType type),
-					IN_GetJoyAbs(word joy,word __far*xp,word __far*yp),
+					IN_GetJoyAbs(word joy,word *xp,word *yp),
 					IN_SetupJoy(word joy,word minx,word maxx,
 								word miny,word maxy, global_game_variables_t *gvar),
 #if DEMO0
@@ -241,12 +244,10 @@ extern	byte		*IN_GetScanName(ScanCode);
 byte	IN_MouseButtons (global_game_variables_t *gvar);
 byte	IN_JoyButtons (void);
 
-void INL_GetJoyDelta(word joy,int __far*dx,int __far*dy/*,boolean adaptive*/, global_game_variables_t *gvar);
+void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/, global_game_variables_t *gvar);
 void IN_StartAck(global_game_variables_t *gvar);
 boolean IN_CheckAck (global_game_variables_t *gvar);
 boolean IN_IsUserInput(global_game_variables_t *gvar);
-#define Mouse(x)         INL_Mouse(x)
-//void IN_SetKeyHook(void (*hook)());
 #if DEMO0
 boolean IN_StartDemoRecord(word bufsize);
 void IN_StartDemoPlayback(byte *buffer,word bufsize);