X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=9e4bfc2e88ae047cf49024a4e5919e5818cc117a;hb=c11666ac6f605f561e9c6c6f2bba3bccea4a7b18;hp=eecfae5905bd772859827f1c8385ad0d2779825c;hpb=f1605e99959acfb32b36ae875601fc14dd670742;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index eecfae59..9e4bfc2e 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -28,17 +28,20 @@
 #define	__16_IN__
 
 #include <string.h>
-#include "src/lib/16_head.h"
-#include "src/lib/bitmap.h"
-
-#ifdef	__DEBUG__
-//#define	__DEBUG_InputMgr__
+#include "src/lib/16_head.h"
+#include "src/lib/16_timer.h"
+#ifdef __WATCOMC__	//borland C BCEXMM.EXE
+#include "src/lib/16_dbg.h"
+#include "src/lib/16_sprit.h"
+#include "src/lib/16_enti.h"
+//#include "src/lib/bitmap.h"	//old format
 #endif
 
-#ifdef	__DEBUG_InputMgr__
-#define TESTKEYIN
-//#define TESTCONTROLNOISY
-#endif
+//if else for gfxtesting and direction
+//player[pn].d == 2 ||
+//player[pn].d != 2 ||
+#define DIRECTIONIFELSE	(player[pn].info.dir == 2)
+//#define NDIRECTIONIFELSE	(player[pn].info.dir != 2)
 
 #define	KeyInt	9	// The keyboard ISR number
 
@@ -47,7 +50,7 @@
 #define	JoyScaleShift	8
 #define	MaxJoyValue		5000
 
-#define	MaxPlayers	4
+#define	MaxPlayers		2//futre plans for multiple playable charaters and being able to alternate
 #define	MaxKbds		2
 #define	MaxJoys		2
 #define	MaxPads		2
@@ -159,8 +162,6 @@ typedef	enum		{
 						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,
@@ -175,14 +176,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,
@@ -194,17 +195,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
 {
@@ -215,15 +212,27 @@ typedef	struct
 	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 sheetsetx; //NOT USED YET! player sprite sheet set on the image x
-	int sheetsety; //NOT USED YET! player sprite sheet set on the image y
-	word d;	//direction!! wwww
-	word q; //loop variable
+	int sheetsety; //NOT USED YET! player sprite sheet set on the image y
+	byte d;		//direction to render sprite!! wwww
+	byte q;		//loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www
+	byte near pdir;	//previous direction~
+	//byte near kd[2];	//array of arrow key pressed
 	word speed;		//player speed!
-	bitmap_t data; //supposively the sprite sheet data
-	sword hp; //hitpoints of the player
+	word spt;		//speed per tile
+//0000	planar_buf_t huge *data; //supposively the sprite sheet data
+//	planar_buf_t data; //supposively the sprite sheet data
+////0000----
+#ifdef	__WATCOMC__
+	struct sprite	*spri;	//supposively the sprite sheet data
+	memptr		gr;
+	entity_t		*ent;
+#endif
+	bitmap_t *data;		//supposively the sprite sheet data//old format
+	sword hp; //hitpoints of the player
 	int persist_aniframe;    /* gonna be increased to 1 before being used, so 0 is ok for default */
 	CursorInfo	info;
-	ControlType	Controls;
+	ControlType	Controls;
+	int dx, dy, delta;	//TODO: what is this? ^^
 } player_t;
 
 /*
@@ -237,7 +246,6 @@ typedef	struct
 {
 	boolean			MousePresent;
 	boolean			JoysPresent[MaxJoys];
-	boolean			JoyPadPresent[MaxPads];
 	boolean		Keyboard[NumCodes];
 	boolean		Paused;
 	char		LastASCII;
@@ -245,7 +253,6 @@ typedef	struct
 
 	KeyboardDef	KbdDefs[MaxKbds];
 	JoystickDef	JoyDefs[MaxJoys];
-	JoypadDef	JoypadDefs[MaxPads];
 } inpu;*/
 
 #ifdef DEMO0
@@ -254,8 +261,6 @@ typedef	struct
 		static word		DemoOffset,DemoSize;
 #endif
 
-extern dword far* clockdw;
-
 //	Internal routines
 extern void interrupt INL_KeyService();
 extern void Mouse(int x);
@@ -280,8 +285,8 @@ 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 near IN_ReadControl(int pn,player_t *player);
+extern 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);
@@ -298,5 +303,6 @@ 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);
+void IN_initplayer(player_t *player, word pn);
 
 #endif