X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=062e3beef1dba3a4f18bd09bec4f8f5161de9da6;hb=e77c01c6cc12efa9a6bd14a9e663be5951181878;hp=cc67511d62015bd16638f3ff825663d5337ac6b0;hpb=05927c200c772fbae9ae1a0db9930f65b0f75c85;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index cc67511d..062e3bee 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,7 +38,7 @@
 
 #include "src/lib/16_in.h"
 
-word testkeyin=0,testcontrolnoisy=0;
+byte testkeyin=0,testcontrolnoisy=0,gfxtest=0;
 
 /*
 =============================================================================
@@ -237,7 +237,7 @@ static	boolean	special;
 	if (INL_KeyHook && !special)
 		INL_KeyHook();
 //#ifdef TESTKEYIN
-	if(testkeyin > 0) printf("%c %x %u\n", c, k, inpu.Keyboard[k]);
+	if(testkeyin > 0) printf("%c	[0x%x %u]	%u\n", c, k, k, inpu.Keyboard[k]);
 //endif
 	outp(0x20,0x20);
 }
@@ -669,6 +669,7 @@ IN_Startup()
 void
 IN_Default(boolean gotit,player_t *player,ControlType nt)
 {
+	int i;
 	if
 	(
 		(!gotit)
@@ -690,6 +691,8 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
 	inpu.KbdDefs[0].down = 0x50;
 	//in.KbdDefs[0].downright = 0x51;
 	IN_SetControlType(0,player,nt);
+	for(i=0; i>MaxPlayers;i++)
+		player[i].d=2;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -800,7 +803,7 @@ IN_ReadCursor(CursorInfo *info)
 //
 ///////////////////////////////////////////////////////////////////////////
 void near
-IN_ReadControl(int playnum,player_t *player)
+IN_ReadControl(int pn,player_t *player)
 {
 			boolean		realdelta;
 			byte		dbyte;
@@ -837,7 +840,7 @@ register	KeyboardDef	*def;
 	else
 	{
 #endif
-		switch (type = player[playnum].Controls)
+		switch (type = player[pn].Controls)
 		{
 		case ctrl_Keyboard1:
 		case ctrl_Keyboard2:
@@ -851,16 +854,21 @@ register	KeyboardDef	*def;
 				mx = motion_Left,my = motion_Down;
 			else if (Keyboard[def->downright])
 				mx = motion_Right,my = motion_Down;*/
-			if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
-			if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down] && player[playnum].d == 2))// || player[playnum].info.dir == 0)
-				my = motion_Up;
-			if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up] && player[playnum].d == 2))// || player[playnum].info.dir == 4)
-				my = motion_Down;
-			}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){
-			if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right] && player[playnum].d == 2))// || player[playnum].info.dir == 1)
-				mx = motion_Left;
-			if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left] && player[playnum].d == 2))// || player[playnum].info.dir == 3)
-				mx = motion_Right;
+			if(DIRECTIONIFELSEGFXTEST)
+			{
+				if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){// &&		(inpu.Keyboard[def->up] || inpu.Keyboard[def->down])){
+// 					if(testcontrolnoisy > 0){ printf("ud "); printf("%u ", inpu.Keyboard[def->up]); printf("%u ", inpu.Keyboard[def->down]);}
+				if(inpu.Keyboard[def->up] && !inpu.Keyboard[def->down])// || player[pn].info.pdir == 0)
+					my = motion_Up;
+				if(inpu.Keyboard[def->down] && !inpu.Keyboard[def->up])// || player[pn].info.pdir == 4)
+					my = motion_Down;
+				}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){// &&	(inpu.Keyboard[def->left] || inpu.Keyboard[def->right])){
+// 					if(testcontrolnoisy > 0){ printf("lr "); printf("%u ", inpu.Keyboard[def->left]); printf("%u ", inpu.Keyboard[def->right]); }
+				if(inpu.Keyboard[def->left] && !inpu.Keyboard[def->right])// || player[pn].info.pdir == 1)
+					mx = motion_Left;
+				if(inpu.Keyboard[def->right] && !inpu.Keyboard[def->left])// || player[pn].info.pdir == 3)
+					mx = motion_Right;
+				}
 			}
 			//input from player
 			if (inpu.Keyboard[def->button0])
@@ -900,22 +908,27 @@ register	KeyboardDef	*def;
 		dy = my;// * 127;
 	}
 
-	player[playnum].info.x = dx;
-	player[playnum].info.xaxis = mx;
-	player[playnum].info.y = dy;
-	player[playnum].info.yaxis = my;
-	player[playnum].info.button0 = buttons & (1 << 0);
-	player[playnum].info.button1 = buttons & (1 << 1);
-	player[playnum].info.button2 = buttons & (1 << 2);
-	player[playnum].info.button3 = buttons & (1 << 3);
-//	player[playnum].info.dir = DirTable[((my + 1) * 3) + (mx + 1)];
-	conpee=(((my + 1) * 2) + (mx + 1));
-	if(conpee) conpee--;
-	player[playnum].info.dir = DirTable[conpee];
-	if(player[playnum].q==1 && (mx!=motion_None || my!=motion_None))
+	player[pn].info.x = dx;
+	player[pn].info.xaxis = mx;
+	player[pn].info.y = dy;
+	player[pn].info.yaxis = my;
+	player[pn].info.button0 = buttons & (1 << 0);
+	player[pn].info.button1 = buttons & (1 << 1);
+	player[pn].info.button2 = buttons & (1 << 2);
+	player[pn].info.button3 = buttons & (1 << 3);
+//	player[pn].info.dir = DirTable[((my + 1) * 3) + (mx + 1)];
+	conpee=(((my + 1) * 2) + (mx + 1))-1; //if(conpee) conpee--;
+	player[pn].info.dir = DirTable[conpee];
+	if(DIRECTIONIFELSEGFXTEST && player[pn].d != player[pn].info.dir) player[pn].pdir=DirTable[conpee];
+	if(player[pn].q==1 && (mx!=motion_None || my!=motion_None))
 	{
-		player[playnum].d = player[playnum].info.dir;
+		player[pn].d = player[pn].info.dir;
+		//printf("q =%d ", player[pn].q);
+		//if(testcontrolnoisy > 0)
+			//if(testcontrolnoisy > 0)
+		//printf("cpee=%d ", conpee);
 	}
+	if(testcontrolnoisy > 0)
 
 #if DEMO0
 	if (DemoMode == demo_Record)
@@ -944,11 +957,13 @@ register	KeyboardDef	*def;
 #endif
 //#ifdef TESTCONTROLNOISY
 if(testcontrolnoisy > 0)
-if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])&& player[playnum].info.dir!=2)
+if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right]) && NDIRECTIONIFELSEGFXTEST)
 {
+	printf("q=%d ", player[pn].q);
+	printf("cpee=%d ", conpee);
 	printf("(mx)=%d	", mx);
 	printf("(my)=%d	", my);
-	printf("dir=%d\n", player[playnum].info.dir);
+	printf("pdir=%d d=%d dir=%d\n", player[pn].pdir, player[pn].d, player[pn].info.dir);
 }
 //#endif
 }
@@ -960,10 +975,10 @@ if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->lef
 //
 ///////////////////////////////////////////////////////////////////////////
 void
-IN_SetControlType(word playnum,player_t *player,ControlType type)
+IN_SetControlType(word pn,player_t *player,ControlType type)
 {
 	// DEBUG - check that requested type is present?
-	player[playnum].Controls = type;
+	player[pn].Controls = type;
 }
 
 #if DEMO0
@@ -1215,7 +1230,7 @@ void IN_ClearKey(byte code)
 boolean IN_qb(byte kee)
 {
 //#ifdef TESTKEYIN
-	if(testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);
+//	if(testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);
 //#endif
 	if(inpu.Keyboard[kee]==true) return 1;
 	else return 0;