X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=8843061e4a669d0dafbfd85485291013b6090af3;hb=4d4c2774d4e51f7356f7a5ef32ef61a9fd2c299a;hp=c2b4b622ca1ef45acaf9477ac8dff43c6ccdbdcf;hpb=0e305ed530c51bad26fa3048c8e1c138d547d946;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index c2b4b622..8843061e 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -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
@@ -239,14 +242,12 @@ extern	byte		*IN_GetScanName(ScanCode);
 
 
 byte	IN_MouseButtons (global_game_variables_t *gvar);
-byte	IN_JoyButtons (void);
+word	IN_JoyButtons (void);
 
 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);