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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index b2170176..9e4bfc2e 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -32,17 +32,16 @@
 #include "src/lib/16_timer.h"
 #ifdef __WATCOMC__	//borland C BCEXMM.EXE
 #include "src/lib/16_dbg.h"
-#include "src/lib/bitmap.h"	//old format
 #include "src/lib/16_sprit.h"
-#include "src/lib/16_entity.h"
-#endif
-#ifdef	__DEBUG__
-#define	__DEBUG_InputMgr__
-extern boolean dbg_testkeyin,dbg_testcontrolnoisy;
+#include "src/lib/16_enti.h"
+//#include "src/lib/bitmap.h"	//old format
 #endif
 
 //if else for gfxtesting and direction
-#define DIRECTIONIFELSE	(player->info.dir == 2)
+//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
 
@@ -51,7 +50,7 @@ extern boolean dbg_testkeyin,dbg_testcontrolnoisy;
 #define	JoyScaleShift	8
 #define	MaxJoyValue		5000
 
-#define	MaxPlayers	1
+#define	MaxPlayers		2//futre plans for multiple playable charaters and being able to alternate
 #define	MaxKbds		2
 #define	MaxJoys		2
 #define	MaxPads		2
@@ -226,14 +225,14 @@ typedef	struct
 #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;
-	entity_t *ent;
-	int dx, dy, delta;
+	int dx, dy, delta;	//TODO: what is this? ^^
 } player_t;
 
 /*
@@ -286,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 near IN_ReadControl(player_t *player);
-extern void IN_SetControlType(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);
@@ -304,6 +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);
+void IN_initplayer(player_t *player, word pn);
 
 #endif