X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=925eaeebd976ec8e27d02afd617d8d51c2f0fe96;hb=496c6da40bdf534f4ddf3833aee732d1631e5824;hp=5e03e2f229a42a253311363bc6256cac425b75bc;hpb=465a28bde642141b8221a5217373e5f7c844e6c6;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 5e03e2f2..925eaeeb 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,7 +38,7 @@
 
 #include "src/lib/16_in.h"
 
-byte testkeyin=0,testcontrolnoisy=0;
+byte testkeyin=0,testcontrolnoisy=0,testctrltype=0;
 
 /*
 =============================================================================
@@ -51,7 +51,7 @@ struct inconfig
 {
 	boolean			MousePresent;
 	boolean			JoysPresent[MaxJoys];
-	boolean			JoyPadPresent[MaxPads];
+// 	boolean			JoyPadPresent[MaxPads];
 	boolean		Keyboard[NumCodes];
 	boolean		Paused;
 	char		LastASCII;
@@ -59,7 +59,7 @@ struct inconfig
 
 	KeyboardDef	KbdDefs[MaxKbds];
 	JoystickDef	JoyDefs[MaxJoys];
-	JoypadDef	JoypadDefs[MaxPads];
+// 	JoypadDef	JoypadDefs[MaxPads];
 } inpu;
 
 //extern inconfig inpu;
@@ -659,6 +659,7 @@ IN_Startup()
 		inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;
 
 	inst.IN_Started = true;
+
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -670,14 +671,15 @@ void
 IN_Default(boolean gotit,player_t *player,ControlType nt)
 {
 	int i;
+	if(testctrltype==0)
 	if
 	(
 		(!gotit)
 	|| 	((nt == ctrl_Joystick1) && !inpu.JoysPresent[0])
 	|| 	((nt == ctrl_Joystick2) && !inpu.JoysPresent[1])
 	|| 	((nt == ctrl_Mouse) && !inpu.MousePresent)
-	|| 	((nt == ctrl_Joypad1) && !inpu.JoyPadPresent[0])
-	|| 	((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])
+// 	|| 	((nt == ctrl_Joypad1) && !inpu.JoyPadPresent[0])
+// 	|| 	((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])
 	)
 		nt = ctrl_Keyboard1;
 	inpu.KbdDefs[0].button0 = 0x1c;
@@ -812,6 +814,7 @@ IN_ReadControl(int pn,player_t *player)
 			Motion		mx,my;
 			ControlType	type;
 			sword conpee;
+			byte dir=DirTable[2];
 register	KeyboardDef	*def;
 
 	dx = dy = 0;
@@ -840,6 +843,7 @@ register	KeyboardDef	*def;
 	else
 	{
 #endif
+		if(testctrltype>0) printf("player[pn].Controls=%c\n", player[pn].Controls);
 		switch (type = player[pn].Controls)
 		{
 		case ctrl_Keyboard1:
@@ -854,19 +858,38 @@ register	KeyboardDef	*def;
 				mx = motion_Left,my = motion_Down;
 			else if (Keyboard[def->downright])
 				mx = motion_Right,my = motion_Down;*/
-			if(DIRECTIONIFELSEGFXTEST)
+			if(DIRECTIONIFELSE)
+			{
 			if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
-//				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].pdir == 0)
-				my = motion_Up;
-			if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]) || player[pn].pdir == 4)
-				my = motion_Down;
+				if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))
+					my = motion_Up;
+				if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]))
+					my = motion_Down;
 			}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){
-//				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].pdir == 1)
-				mx = motion_Left;
-			if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]) || player[pn].pdir == 3)
-				mx = motion_Right;
+				if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]))
+					mx = motion_Left;
+				if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))// || player[pn].pdir != 1)
+					mx = motion_Right;
+			}else
+				//if(mx+my!=1 && mx+my!=-1 && mx!=my!=0)
+				{	//2 keys pressed
+					switch (player[pn].pdir)
+					{
+						case 0:
+						case 4:
+							if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right])) dir = DirTable[1];
+							else if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left])) dir = DirTable[3];
+						break;
+						case 1:
+						case 3:
+							if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down])) dir = DirTable[0];
+							else if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up])) dir = DirTable[4];
+						break;
+						default:
+						break;
+					}
+					if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c	", dirchar(player[pn].pdir)); }
+				}//else printf("				");
 			}
 			//input from player
 			if (inpu.Keyboard[def->button0])
@@ -875,6 +898,8 @@ register	KeyboardDef	*def;
 				buttons += 1 << 1;
 			realdelta = false;
 			break;
+// 		case ctrl_Joypad1:
+// 		case ctrl_Joypad2:
 		case ctrl_Joystick1:
 		case ctrl_Joystick2:
 			INL_GetJoyDelta(type - ctrl_Joystick,&dx,&dy,false);
@@ -886,10 +911,6 @@ register	KeyboardDef	*def;
 			buttons = INL_GetMouseButtons();
 			realdelta = true;
 			break;
-		case ctrl_Joypad1:
-		case ctrl_Joypad2:
-			printf("wwww");
-			break;
 		}
 #ifdef DEMO0
 	}
@@ -915,14 +936,15 @@ register	KeyboardDef	*def;
 	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--;
+	conpee=(((my + 1) * 2) + (mx + 1))-1;
 	player[pn].info.dir = DirTable[conpee];
 
 	//TODO: overwriting direction must be added
-	if(player[pn].d==2) player[pn].pdir=DirTable[conpee];
-	if(player[pn].q==1 && (mx!=motion_None || my!=motion_None))
+	if(DirTable[conpee]!=2)	player[pn].pdir=DirTable[conpee];
+	if(player[pn].q==1 &&( dir!=2 || (mx!=motion_None || my!=motion_None)))
 	{
-		player[pn].d = player[pn].info.dir;
+		if(dir==2) player[pn].d = player[pn].info.dir;
+		else player[pn].d = DirTable[dir];
 	}
 
 #if DEMO0
@@ -952,13 +974,15 @@ 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]) && NDIRECTIONIFELSEGFXTEST)
+if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right]) || player[pn].q>1)
 {
 	printf("q=%d ", player[pn].q);
-	printf("cpee=%d ", conpee);
-	printf("(mx)=%d	", mx);
-	printf("(my)=%d	", my);
-	printf("pdir=%d d=%d dir=%d\n", player[pn].pdir, player[pn].d, player[pn].info.dir);
+	printf("cpee=%c ", dirchar(conpee));
+	//printf("(mx)=%d	", mx);
+	//printf("(my)=%d	", my);
+	//printf("[%d]	", mx+my);
+	printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].d), dirchar(player[pn].info.dir));
+	printf("%c%d %c%d %c%d %c%d\n", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);
 }
 //#endif
 }