X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=9bcec25889cdab222c946b820430dff57e889794;hb=d799ef823a8b57ba6c783ed323430254083158be;hp=9b2705859385605f403125987974f19bf8c860ae;hpb=3c728ff6f9e56111cf019b4c241fc6d37c52adc0;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 9b270585..9bcec258 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -30,20 +30,13 @@
 #include <string.h>
 #include "src/lib/16_head.h"
 #include "src/lib/16_timer.h"
-#include "src/lib/bitmap.h"
-#include "src/lib/planar.h"
-
-#ifdef	__DEBUG__
-//#define	__DEBUG_InputMgr__
-#endif
-
-#ifdef	__DEBUG_InputMgr__
-//#define TESTKEYIN
-//#define TESTCONTROLNOISY
+#ifdef __WATCOMC__	//borland C BCEXMM.EXE
+#include "src/lib/16_dbg.h"
+#include "src/lib/16_spri.h"
+#include "src/lib/16_enti.h"
+//#include "src/lib/bitmap.h"	//old format
 #endif
 
-extern byte testkeyin,testcontrolnoisy,testctrltype;
-
 //if else for gfxtesting and direction
 //player[pn].d == 2 ||
 //player[pn].d != 2 ||
@@ -57,13 +50,13 @@ extern byte testkeyin,testcontrolnoisy,testctrltype;
 #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
 #define	NumCodes	128
 
-typedef	byte		ScanCode;
+//typedef	byte		ScanCode;
 #define	sc_None			0
 #define	sc_Bad			0xff
 #define	sc_Return		0x1c
@@ -162,15 +155,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,
@@ -211,10 +203,6 @@ typedef	struct		{
 									joyMultXL,joyMultYL,
 									joyMultXH,joyMultYH;
 					} JoystickDef;
-// typedef	struct
-// {
-// 	boolean w;
-// } JoypadDef;
 
 typedef	struct
 {
@@ -229,17 +217,22 @@ typedef	struct
 	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!
-//0000	planar_buf_t huge *data; //supposively the sprite sheet data
-//	planar_buf_t data; //supposively the sprite sheet data
-////0000----
-	bitmap_t huge *data; //supposively the sprite sheet data
+	word spt;		//speed per tile
+#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
+	bitmap_t	bmp;
 	sword hp; //hitpoints of the player
-	int persist_aniframe;    /* gonna be increased to 1 before being used, so 0 is ok for default */
+	int persist_aniframe;    // gonna be increased to 1 before being used, so 0 is ok for default
 	CursorInfo	info;
 	ControlType	Controls;
-} player_t;
+//newer vars
+	int dx, dy, delta;	//TODO: what is this? ^^
+} player_t;*/
 
 /*
 =============================================================================
@@ -252,7 +245,6 @@ typedef	struct
 {
 	boolean			MousePresent;
 	boolean			JoysPresent[MaxJoys];
-	boolean			JoyPadPresent[MaxPads];
 	boolean		Keyboard[NumCodes];
 	boolean		Paused;
 	char		LastASCII;
@@ -260,7 +252,6 @@ typedef	struct
 
 	KeyboardDef	KbdDefs[MaxKbds];
 	JoystickDef	JoyDefs[MaxJoys];
-	JoypadDef	JoypadDefs[MaxPads];
 } inpu;*/
 
 #ifdef DEMO0
@@ -293,7 +284,7 @@ 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 near IN_ReadControl(int pn,player_t *player);
+extern void near IN_ReadControl(word pn, player_t *player);
 extern void IN_SetControlType(word pn,player_t *player,ControlType type);
 #if DEMO0
 extern boolean IN_StartDemoRecord(word bufsize);