X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=3c16d32a24f8f4db202d9f884631c9be56155250;hb=dd532df1ba5c28f9efe78c512052563086381e9b;hp=52a767741345c520baa7d5078b7df8e68f075124;hpb=3401a0bddcdce075f8cda8b6392c541050fd36e2;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 52a76774..3c16d32a 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,gfxtest=0;
+boolean testkeyin=0,testcontrolnoisy=0,testctrltype=0;
 
 /*
 =============================================================================
@@ -51,7 +51,6 @@ struct inconfig
 {
 	boolean			MousePresent;
 	boolean			JoysPresent[MaxJoys];
-	boolean			JoyPadPresent[MaxPads];
 	boolean		Keyboard[NumCodes];
 	boolean		Paused;
 	char		LastASCII;
@@ -59,7 +58,6 @@ struct inconfig
 
 	KeyboardDef	KbdDefs[MaxKbds];
 	JoystickDef	JoyDefs[MaxJoys];
-	JoypadDef	JoypadDefs[MaxPads];
 } inpu;
 
 //extern inconfig inpu;
@@ -237,7 +235,7 @@ static	boolean	special;
 	if (INL_KeyHook && !special)
 		INL_KeyHook();
 //#ifdef TESTKEYIN
-	if(testkeyin > 0) printf("%c	[0x%x %u]	%u\n", c, k, k, inpu.Keyboard[k]);
+	if(testkeyin > 0) printf("%c	%u	[0x%x %u]	%u\n", c, c, k, k, inpu.Keyboard[k]);
 //endif
 	outp(0x20,0x20);
 }
@@ -380,6 +378,41 @@ static	word	lasttime;
 	IN_GetJoyAbs(joy,&x,&y);
 	def = inpu.JoyDefs + joy;
 
+	//TODO: inject p16 input controls!
+	//which is this
+	/*			if(DIRECTIONIFELSE)
+			{
+			if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
+				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] && !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("				");
+			}*/
 	if (x < def->threshMinX)
 	{
 		if (x < def->joyMinX)
@@ -659,6 +692,7 @@ IN_Startup()
 		inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;
 
 	inst.IN_Started = true;
+
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -670,14 +704,13 @@ 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_Keyboard1;
 	inpu.KbdDefs[0].button0 = 0x1c;
@@ -812,6 +845,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 +874,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,21 +889,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]){// &&		(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)
+			if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
+				if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))
 					my = motion_Up;
-				if(inpu.Keyboard[def->down] && !inpu.Keyboard[def->up])// || player[pn].info.pdir == 4)
+				if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]))
 					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)
+			}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){
+				if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]))
 					mx = motion_Left;
-				if(inpu.Keyboard[def->right] && !inpu.Keyboard[def->left])// || player[pn].info.pdir == 3)
+				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])
@@ -888,10 +940,6 @@ register	KeyboardDef	*def;
 			buttons = INL_GetMouseButtons();
 			realdelta = true;
 			break;
-		case ctrl_Joypad1:
-		case ctrl_Joypad2:
-			printf("wwww");
-			break;
 		}
 #ifdef DEMO0
 	}
@@ -917,14 +965,14 @@ 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(DIRECTIONIFELSEGFXTEST && player[pn].d != player[pn].info.dir) 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
@@ -954,13 +1002,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
 }
@@ -1232,3 +1282,22 @@ boolean IN_qb(byte kee)
 	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
+}