X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=8d17c37ff27d8950ff024fc8f3f306c5fa6f0cc8;hb=d26e0714368d1cfbe4caee5d6309cf97e0af55db;hp=85709c5e00c53fc90dd649a8698984b3741005ba;hpb=fb97121f7d0be4408d8e2ed98a2f7b10b852a915;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 85709c5e..8d17c37f 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,9 +38,7 @@
 
 #include "src/lib/16_in.h"
 
-#ifdef __DEBUG_InputMgr__
-boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;
-#endif
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 
 /*
 =============================================================================
@@ -51,8 +49,8 @@ boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;
 */
 struct inconfig
 {
-	boolean			MousePresent;
-	boolean			JoysPresent[MaxJoys];
+	boolean		MousePresent;
+	boolean		JoysPresent[MaxJoys];
 	boolean		Keyboard[NumCodes];
 	boolean		Paused;
 	char		LastASCII;
@@ -705,7 +703,7 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
 	//in.KbdDefs[0].downright = 0x51;
 	IN_SetControlType(0,player,nt);
 	for(i=0; i>MaxPlayers;i++)
-		player[i].d=2;
+		player[i].enti.d =2;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -749,7 +747,7 @@ IN_SetKeyHook(void (*hook)())
 void
 IN_ClearKeysDown()
 {
-	int	i;
+	//int	i;
 
 	inpu.LastScan = sc_None;
 	inpu.LastASCII = key_None;
@@ -816,10 +814,12 @@ IN_ReadCursor(CursorInfo *info)
 //
 ///////////////////////////////////////////////////////////////////////////
 void near
-IN_ReadControl(int pn,player_t *player)
+IN_ReadControl(word pn, player_t *player)
 {
 			boolean		realdelta;
+#if DEMO0
 			byte		dbyte;
+#endif
 			word		buttons;
 			int			dx,dy;
 			Motion		mx,my;
@@ -850,7 +850,7 @@ register	KeyboardDef	*def;
 		realdelta = false;
 	}
 	else if (DemoMode == demo_PlayDone)
-		Quit("Demo playback exceeded");
+		Quit ("Demo playback exceeded");
 	else
 	{
 #endif
@@ -949,10 +949,10 @@ register	KeyboardDef	*def;
 	player[pn].info.dir = DirTable[conpee];
 
 	if(DirTable[conpee]!=2)	player[pn].pdir=DirTable[conpee];
-	if(player[pn].q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))
+	if(player[pn].enti.q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))
 	{
-		if(dir==2) player[pn].d = player[pn].info.dir;
-		else player[pn].d = DirTable[dir];
+		if(dir==2) player[pn].enti.d = player[pn].info.dir;
+		else player[pn].enti.d = DirTable[dir];
 	}
 
 #if DEMO0
@@ -973,7 +973,7 @@ register	KeyboardDef	*def;
 				DemoOffset += 2;
 
 			if (DemoOffset >= DemoSize)
-				Quit("Demo buffer overflow");
+				Quit ("Demo buffer overflow");
 
 			DemoBuffer[DemoOffset] = 1;
 			DemoBuffer[DemoOffset + 1] = dbyte;
@@ -982,12 +982,12 @@ register	KeyboardDef	*def;
 #endif
 #ifdef __DEBUG_InputMgr__
 if(dbg_testcontrolnoisy > 0)
-if(player[pn].info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player[pn].q>1)
+if(player[pn].info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player[pn].enti.q>1)
 {
 	//printf("b1=%u b2=%u b3=%u b4=%u	", player[pn].info.button0, player[pn].info.button1, player[pn].info.button2, player[pn].info.button3);
-	//printf("q=%d ", player[pn].q);
+	//printf("q=%d ", player[pn].enti.q);
 	//printf("cpee=%c ", dirchar(conpee));
-	printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].d), dirchar(player[pn].info.dir));
+	printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].enti.d), dirchar(player[pn].info.dir));
 	/*if(realdelta) */printf("dx=%d	dy=%d	mx=%d	my=%d", player[pn].info.x, player[pn].info.y, player[pn].info.xaxis, player[pn].info.yaxis);
 	//else if(!realdelta) printf("%c%d %c%d %c%d %c%d", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);
 	printf("\n");
@@ -1247,7 +1247,17 @@ IN_UserInput(dword delay,boolean clear)
 
 boolean IN_KeyDown(byte code)
 {
+#ifdef __DEBUG_InputMgr__
+	if(!dbg_nointest)
+#endif
 	return inpu.Keyboard[code];
+#ifdef __DEBUG_InputMgr__
+	else
+		if(dbg_nointest && kbhit())
+			return 1;
+		else
+			return 0;
+#endif
 }
 
 void IN_ClearKey(byte code)
@@ -1260,27 +1270,8 @@ void IN_ClearKey(byte code)
 boolean IN_qb(byte kee)
 {
 #ifdef __DEBUG_InputMgr__
-//	if(dbg_testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);
+	if(dbg_testkeyin) printf("%u\n", inpu.Keyboard[kee]);
 #endif
 	if(inpu.Keyboard[kee]==true) return 1;
 	else return 0;
 }
-
-//init player!
-void IN_initplayer(player_t *player, word pn)
-{
-	player[pn].x = player[pn].tx*TILEWH;
-	player[pn].y = player[pn].ty*TILEWH;
-	player[pn].triggerx = player[pn].tx;
-	player[pn].triggery = player[pn].ty+1;
-/*	player[0].info.x = player[0].tx;
-	player[0].info.xaxis = player[0].tx*TILEWH;
-	player[0].info.y = player[0].ty;
-	player[0].info.yaxis = player[0].ty*TILEWH;*/
-	player[pn].q=1;
-	player[pn].d=2;
-	player[pn].hp=4;
-	player[pn].speed=4;
-	player[pn].persist_aniframe=0;
-	player[pn].spt=(TILEWH/(player[pn].speed));	//speed per tile wwww
-}