X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=6df6d06af3927c9243beec8ba9b957b89f8388ed;hb=631d2bde47de81ead5300f7aca378447387f254c;hp=ff9c576e8925d9106255c3f6d9975883a21657a1;hpb=857b82aa09582d5c542e679ad0a32846bc27421d;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
old mode 100644
new mode 100755
index ff9c576e..6df6d06a
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,6 +38,8 @@
 
 #include "src/lib/16_in.h"
 
+boolean testkeyin=0,testcontrolnoisy=0;
+
 /*
 =============================================================================
 
@@ -49,7 +51,6 @@ struct inconfig
 {
 	boolean			MousePresent;
 	boolean			JoysPresent[MaxJoys];
-	boolean			JoyPadPresent[MaxPads];
 	boolean		Keyboard[NumCodes];
 	boolean		Paused;
 	char		LastASCII;
@@ -57,7 +58,6 @@ struct inconfig
 
 	KeyboardDef	KbdDefs[MaxKbds];
 	JoystickDef	JoyDefs[MaxJoys];
-	JoypadDef	JoypadDefs[MaxPads];
 } inpu;
 
 //extern inconfig inpu;
@@ -149,12 +149,12 @@ 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_None,
+						dir_East,
+						dir_South
 						//dir_NorthEast,
 						//dir_Soutinest,
 						//,dir_SouthEast
@@ -234,9 +234,9 @@ static	boolean	special;
 
 	if (INL_KeyHook && !special)
 		INL_KeyHook();
-	#ifdef TESTKEYIN
-	printf("%c %x %u\n", c, k, inpu.Keyboard[k]);
-	#endif
+//#ifdef TESTKEYIN
+	if(testkeyin > 0) printf("%c	%u	[0x%x %u]	%u\n", c, c, k, k, inpu.Keyboard[k]);
+//endif
 	outp(0x20,0x20);
 }
 
@@ -370,10 +370,10 @@ static void
 INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive)
 {
 	word		x,y;
-	dword	time;
-	dword TimeCount = *clockdw;
+	word	time;
+	word TimeCount = *clockw;
 	JoystickDef	*def;
-static	dword	lasttime;
+static	word	lasttime;
 
 	IN_GetJoyAbs(joy,&x,&y);
 	def = inpu.JoyDefs + joy;
@@ -465,8 +465,8 @@ register	word	result;
 word
 IN_GetJoyButtonsDB(word joy)
 {
-	dword TimeCount = *clockdw;
-	dword	lasttime;
+	word TimeCount = *clockw;
+	word	lasttime;
 	word		result1,result2;
 
 	do
@@ -657,6 +657,7 @@ IN_Startup()
 		inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;
 
 	inst.IN_Started = true;
+
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -667,14 +668,13 @@ IN_Startup()
 void
 IN_Default(boolean gotit,player_t *player,ControlType nt)
 {
+	int i;
 	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_Keyboard1;
 	inpu.KbdDefs[0].button0 = 0x1c;
@@ -688,6 +688,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;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -797,8 +799,8 @@ IN_ReadCursor(CursorInfo *info)
 //		player and fills in the control info struct
 //
 ///////////////////////////////////////////////////////////////////////////
-void
-IN_ReadControl(int playnum,player_t *player)
+void near
+IN_ReadControl(int pn,player_t *player)
 {
 			boolean		realdelta;
 			byte		dbyte;
@@ -806,6 +808,8 @@ IN_ReadControl(int playnum,player_t *player)
 			int			dx,dy;
 			Motion		mx,my;
 			ControlType	type;
+			sword conpee;
+			byte dir=DirTable[2];
 register	KeyboardDef	*def;
 
 	dx = dy = 0;
@@ -834,7 +838,7 @@ register	KeyboardDef	*def;
 	else
 	{
 #endif
-		switch (type = player[playnum].Controls)
+		switch (type = player[pn].Controls)
 		{
 		case ctrl_Keyboard1:
 		case ctrl_Keyboard2:
@@ -848,19 +852,39 @@ register	KeyboardDef	*def;
 				mx = motion_Left,my = motion_Down;
 			else if (Keyboard[def->downright])
 				mx = motion_Right,my = motion_Down;*/
-
+//TODO: make this into a function that the joystick AND keyboard can use wwww
+			if(DIRECTIONIFELSE)//(player[pn].info.dir == 2)
+			{
 			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->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 (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]))
+					mx = motion_Left;
+				if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))
+					mx = motion_Right;
+			}else{	//2 keys pressed
+					switch (player[pn].pdir)
+					{
+						case 0:
+						case 4:
+							if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right])){ dir = DirTable[1]; }//mx = motion_Left; }
+							else if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left])){ dir = DirTable[3]; }//mx = motion_Right; }
+						break;
+						case 1:
+						case 3:
+							if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down])){ dir = DirTable[0]; }//my = motion_Up; }
+							else if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up])){ dir = DirTable[4]; }//my = motion_Down; }
+						break;
+						default:
+						break;
+					}
+					//if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c	", dirchar(player[pn].pdir)); }
+				}
 			}
+			//input from player
 			if (inpu.Keyboard[def->button0])
 				buttons += 1 << 0;
 			if (inpu.Keyboard[def->button1])
@@ -878,10 +902,6 @@ register	KeyboardDef	*def;
 			buttons = INL_GetMouseButtons();
 			realdelta = true;
 			break;
-		case ctrl_Joypad1:
-		case ctrl_Joypad2:
-			printf("wwww");
-			break;
 		}
 #ifdef DEMO0
 	}
@@ -894,20 +914,28 @@ 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;
-	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)];
-	player[playnum].info.dir = DirTable[(((my + 1) * 2) + (mx + 1))-1];
+	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;
+	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(dir==2) player[pn].d = player[pn].info.dir;
+		else player[pn].d = DirTable[dir];
+	}
 
 #if DEMO0
 	if (DemoMode == demo_Record)
@@ -934,14 +962,17 @@ register	KeyboardDef	*def;
 		}
 	}
 #endif
-#ifdef TESTCONTROLNOISY
-if(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])
-{
-	printf("(mx)=%d	", mx);
-	printf("(my)=%d	", my);
-	printf("dir=%d\n", player[playnum].info.dir);
+if(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)
+{
+	//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("cpee=%c ", dirchar(conpee));
+	printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].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");
 }
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -951,10 +982,10 @@ if(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left
 //
 ///////////////////////////////////////////////////////////////////////////
 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
@@ -1175,8 +1206,8 @@ IN_IsUserInput()
 boolean
 IN_UserInput(dword delay,boolean clear)
 {
-	dword TimeCount = *clockdw;
-	dword	lasttime;
+	word TimeCount = *clockw;
+	word	lasttime;
 
 	lasttime = TimeCount;
 	do
@@ -1205,7 +1236,28 @@ void IN_ClearKey(byte code)
 
 boolean IN_qb(byte kee)
 {
-	printf("%u\n", inpu.Keyboard[kee]);
+//#ifdef TESTKEYIN
+//	if(testkeyin > 0) 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
+}