X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.h;h=67a98f6175e0443261c0451a908e48c2dafe7bba;hb=1159fe5a6cd0f8eaeee6e8584f5972d42e004073;hp=0990a55089d68ccdcf3b3cd786c7d0ab991e324c;hpb=d71e4ebbd3770b48eee2b2cc18288b97aad4e1e4;p=16.git

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 0990a550..67a98f61 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_sprit.h"
+#include "src/lib/16_enti.h"
+//#include "src/lib/bitmap.h"	//old format
 #endif
 
-extern boolean testkeyin,testcontrolnoisy,testctrltype;
-
 //if else for gfxtesting and direction
 //player[pn].d == 2 ||
 //player[pn].d != 2 ||
@@ -57,7 +50,7 @@ extern boolean 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
@@ -225,14 +218,21 @@ typedef	struct
 	byte near pdir;	//previous direction~
 	//byte near kd[2];	//array of arrow key pressed
 	word speed;		//player speed!
+	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----
-	bitmap_t huge *data; //supposively the sprite sheet data
+#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;
+	int dx, dy, delta;	//TODO: what is this? ^^
 } player_t;
 
 /*
@@ -303,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