no idea how to get joy buttons 2 and 3 to function.

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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index c2b4b62..e85b624 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2021 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -144,11 +144,14 @@
 #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
+#define        Mouse(x)        _AX = x,geninterrupt(MouseInt)\r
+\r
 #ifdef DEMO0\r
 typedef        enum            {\r
                                                demo_Off,demo_Record,demo_Playback,demo_PlayDone\r
@@ -239,14 +242,12 @@ extern    byte            *IN_GetScanName(ScanCode);
 \r
 \r
 byte   IN_MouseButtons (global_game_variables_t *gvar);\r
-byte   IN_JoyButtons (void);\r
+word   IN_JoyButtons (void);\r
 \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
 boolean IN_StartDemoRecord(word bufsize);\r
 void IN_StartDemoPlayback(byte *buffer,word bufsize);\r