X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=f07a694f4ea7bd03f85923ed492731913c46a59f;hb=54e82e70b7b402a7aa8e08cf99844c10bc9e89c3;hp=b19702d088ccabb92f92e633b89ea6c3a3102f59;hpb=96a1197c2071ccb64faa19b149a22b86ce3b3d5e;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index b19702d0..f07a694f 100644
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -149,12 +149,15 @@ static	byte        far ASCIINames[] =		// Unshifted ASCII for scan codes
 
 static	Direction	DirTable[] =		// Quick lookup for total direction
 					{
-						//dir_Nortinest,
-						dir_North,
+						//dir_Nortinest,
+						dir_North,
+						dir_West,
+						dir_None,	
+						dir_East,
+						dir_South
 						//dir_NorthEast,
-						dir_West,		dir_None,	dir_East,
 						//dir_Soutinest,
-						dir_South//,dir_SouthEast
+						//,dir_SouthEast
 					};
 #ifdef __cplusplus
 }
@@ -674,7 +677,7 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
 	|| 	((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])
 	)
 		nt = ctrl_Keyboard1;
-	inpu.KbdDefs[0].button0 = 0x1d;
+	inpu.KbdDefs[0].button0 = 0x1c;
 	inpu.KbdDefs[0].button1 = 0x38;
 	//in.KbdDefs[0].upleft = 0x47;
 	inpu.KbdDefs[0].up = 0x48;
@@ -796,18 +799,19 @@ IN_ReadCursor(CursorInfo *info)
 ///////////////////////////////////////////////////////////////////////////
 void
 IN_ReadControl(int playnum,player_t *player)
-{
+{
 			boolean		realdelta;
 			byte		dbyte;
 			word		buttons;
 			int			dx,dy;
 			Motion		mx,my;
-			ControlType	type;
+			ControlType	type;
+			sword conpee;
 register	KeyboardDef	*def;
 
 	dx = dy = 0;
 	mx = my = motion_None;
-	buttons = 0;
+	buttons = 0;
 
 #if DEMO0
 	if (DemoMode == demo_Playback)
@@ -845,18 +849,16 @@ 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])
-				my = motion_Up;
-			else if (inpu.Keyboard[def->down])
-				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])
-				mx = motion_Left;
-			else if (inpu.Keyboard[def->right])
-				mx = motion_Right;
+			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 (inpu.Keyboard[def->button0])
 				buttons += 1 << 0;
@@ -891,10 +893,10 @@ register	KeyboardDef	*def;
 	}
 	else
 	{
-		dx = mx * 127;
-		dy = my * 127;
+		dx = mx;// * 127;
+		dy = my;// * 127;
 	}
-
+
 	player[playnum].info.x = dx;
 	player[playnum].info.xaxis = mx;
 	player[playnum].info.y = dy;
@@ -903,7 +905,14 @@ register	KeyboardDef	*def;
 	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)];
+//	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[playnum].d = player[playnum].info.dir;
+	}
 
 #if DEMO0
 	if (DemoMode == demo_Record)
@@ -930,8 +939,13 @@ register	KeyboardDef	*def;
 		}
 	}
 #endif
-#ifdef TESTCONTROLNOISY
-printf("dir=%d\n", player[playnum].info.dir);
+#ifdef TESTCONTROLNOISY
+if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])&& player[playnum].info.dir!=2)
+{
+	printf("(mx)=%d	", mx);
+	printf("(my)=%d	", my);
+	printf("dir=%d\n", player[playnum].info.dir);
+}
 #endif
 }
 
@@ -1195,8 +1209,10 @@ void IN_ClearKey(byte code)
 	}
 
 boolean IN_qb(byte kee)
-{
-	printf("%u\n", inpu.Keyboard[kee]);
+{
+	#ifdef TESTKEYIN
+	printf("%u\n", inpu.Keyboard[kee]);
+	#endif
 	if(inpu.Keyboard[kee]==true) return 1;
 	else return 0;
 }