X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=97a560d0e998168a09c4a2d9b88aedb62ff83618;hp=fe621bc7f5570f726d3930b6b4d48177ff37d27c;hb=af2715fef8681d909afe82f7baaf5e13baabb76f;hpb=634cab2f93fbfecbfd035e1aadd6b396c5ad73a6

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
old mode 100644
new mode 100755
index fe621bc7..97a560d0
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -1,21 +1,24 @@
-/* Catacomb Apocalypse Source Code
- * Copyright (C) 1993-2014 Flat Rock Software
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * Project 16 is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
  */
-
 //
 //	ID Engine
 //	ID_IN.h - Header file for Input Manager
@@ -29,14 +32,11 @@
 
 #include <string.h>
 #include "src/lib/16_head.h"
-
-#ifdef	__DEBUG__
-#define	__DEBUG_InputMgr__
-#endif
-
-#ifdef	__DEBUG_InputMgr__
-#define TESTKEYIN
-#define TESTCONTROLNOISY
+#include "src/lib/16_timer.h"
+#include "src/lib/16_dbg.h"
+#ifdef __WATCOMC__	//borland C BCEXMM.EXE
+#include "src/lib/16_spri.h"
+#include "src/lib/16_enti.h"
 #endif
 
 #define	KeyInt	9	// The keyboard ISR number
@@ -46,13 +46,12 @@
 #define	JoyScaleShift	8
 #define	MaxJoyValue		5000
 
-#define	MaxPlayers	4
+//#define	MaxPlayers		2//future plans for multiple playable charaters and being able to alternate
 #define	MaxKbds		2
 #define	MaxJoys		2
-#define	MaxPads		2
 #define	NumCodes	128
 
-typedef	byte		ScanCode;
+//typedef	byte		ScanCode;
 #define	sc_None			0
 #define	sc_Bad			0xff
 #define	sc_Return		0x1c
@@ -151,15 +150,14 @@ typedef	enum		{
 						demo_Off,demo_Record,demo_Playback,demo_PlayDone
 					} Demo;
 #endif
-typedef	enum		{
+//moved to 16_tdef.h
+/*typedef	enum		{
 						//ctrl_None,				// MDM (GAMERS EDGE) - added
 						ctrl_Keyboard,
 							ctrl_Keyboard1 = ctrl_Keyboard,ctrl_Keyboard2,
 						ctrl_Joystick,
 							ctrl_Joystick1 = ctrl_Joystick,ctrl_Joystick2,
 						ctrl_Mouse,
-						ctrl_Joypad,
-							ctrl_Joypad1 = ctrl_Joypad,ctrl_Joypad2
 					} ControlType;
 typedef	enum		{
 						motion_Left = -1,motion_Up = -1,
@@ -174,14 +172,14 @@ typedef	enum		{
 						dir_South,//dir_Soutinest,
 					} Direction;
 typedef	struct		{
-						boolean		button0,button1,button2,button3;
-						int			x,y;
-						Motion		xaxis,yaxis;
-						Direction	dir;
+						boolean	near	button0,button1,button2,button3;
+						int	near		x,y;
+						Motion	near	xaxis,yaxis;
+						Direction near	dir;
 					} CursorInfo;
 
 typedef	struct		{
-						ScanCode	button0,button1,
+						ScanCode near	button0,button1,
 									//upleft,
 									up,
 									down,
@@ -193,35 +191,13 @@ typedef	struct		{
 									;
 					} KeyboardDef;
 typedef	struct		{
-						word		joyMinX,joyMinY,
+						word	near	joyMinX,joyMinY,
 									threshMinX,threshMinY,
 									threshMaxX,threshMaxY,
 									joyMaxX,joyMaxY,
 									joyMultXL,joyMultYL,
 									joyMultXH,joyMultYH;
-					} JoystickDef;
-typedef	struct
-{
-	boolean w;
-} JoypadDef;
-
-typedef	struct
-{
-	int x; //player exact position on the viewable map
-	int y; //player exact position on the viewable map
-	int tx; //player tile position on the viewable map
-	int ty; //player tile position on the viewable map
-	int triggerx; //player's trigger box tile position on the viewable map
-	int triggery; //player's trigger box tile position on the viewable map
-	int setx; //NOT USED YET! player sprite sheet set on the image x
-	int sety; //NOT USED YET! player sprite sheet set on the image y
-	word q; //loop variable
-//	word d; //direction
-	//bitmap_t data; //supposively the sprite sheet data
-	int hp; //hitpoints of the player
-	CursorInfo	info;
-	ControlType	Controls;
-} player_t;
+					} JoystickDef;*/
 
 /*
 =============================================================================
@@ -230,70 +206,55 @@ typedef	struct
 
 =============================================================================
 */
-/*extern struct inconfig
-{
-	boolean			MousePresent;
-	boolean			JoysPresent[MaxJoys];
-	boolean			JoyPadPresent[MaxPads];
-	boolean		Keyboard[NumCodes];
-	boolean		Paused;
-	char		LastASCII;
-	ScanCode	LastScan;
-
-	KeyboardDef	KbdDefs[MaxKbds];
-	JoystickDef	JoyDefs[MaxJoys];
-	JoypadDef	JoypadDefs[MaxPads];
-} inpu;*/
-
 #ifdef DEMO0
 		static Demo		DemoMode = demo_Off;
 		static byte /*_seg*/	*DemoBuffer;
 		static word		DemoOffset,DemoSize;
 #endif
 
-extern dword /*far**/ clockdw;
-
 //	Internal routines
-extern void interrupt INL_KeyService();
-extern 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);
-//static void INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive);
-//static word INL_GetJoyButtons(word joy);
-extern word IN_GetJoyButtonsDB(word joy);
-//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);
-//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();
-//static void INL_AdjustCursor(CursorInfo *info,word buttons,int dx,int dy);
-extern void IN_ReadCursor(CursorInfo *info);
-extern void IN_ReadControl(int playnum,player_t *player);
-extern void IN_SetControlType(word playnum,player_t *player,ControlType type);
+extern	void		IN_Startup(global_game_variables_t *gvar),IN_Shutdown(global_game_variables_t *gvar),
+					IN_Default(boolean gotit,player_t *player,ControlType nt, global_game_variables_t *gvar),
+					IN_SetKeyHook(void (*)()),
+					IN_ClearKeysDown(void),
+					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 *xp,word *yp),
+					IN_SetupJoy(word joy,word minx,word maxx,
+								word miny,word maxy, global_game_variables_t *gvar),
+#if DEMO0
+					IN_StopDemo(void),IN_FreeDemoBuffer(void),
+#endif
+					IN_Ack(global_game_variables_t *gvar),IN_AckBack(void);
+extern	boolean		IN_UserInput(word delay, global_game_variables_t *gvar);
+extern	char		IN_WaitForASCII(void);
+extern	ScanCode	IN_WaitForKey(void);
+extern	word		IN_GetJoyButtonsDB(word joy);
+extern	byte		*IN_GetScanName(ScanCode);
+
+
+byte	IN_MouseButtons (global_game_variables_t *gvar);
+byte	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
-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 *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);
+
+boolean	IN_KeyDown(byte code),
+		IN_qb(byte kee);
+void		IN_ClearKey(byte code),
+		IN_KbdLED();
+ScanCode	IN_GetLastScan(),
+		IN_GetCurCode();
 
 #endif