Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

1 files changed, 22 insertions, 20 deletions

diff --git a/src/elements/figh.c b/src/elements/figh.c
index 284a56c..928923f 100644
--- a/src/elements/figh.c
+++ b/src/elements/figh.c
@@ -4,41 +4,41 @@ int update_FIGH(UPDATE_FUNC_ARGS)
 {
 	playerst* figh = &fighters[(unsigned char)parts[i].tmp];
 
-	float tarx, tary;
+	unsigned int tarx, tary;
 
 	parts[i].tmp2 = 0; //0 - stay in place, 1 - seek a stick man
 
 	//Set target cords
-	if (player.spwn)
+	if (player.spwn && player2.spwn)
 	{
-		if (player2.spwn)
 			if ((pow(player.legs[2]-x, 2) + pow(player.legs[3]-y, 2))<=
 					(pow(player2.legs[2]-x, 2) + pow(player2.legs[3]-y, 2)))
 			{
-				tarx = player.legs[2];
-				tary = player.legs[3];
+				tarx = (unsigned int)player.legs[2];
+				tary = (unsigned int)player.legs[3];
 			}
 			else
 			{
-				tarx = player2.legs[2];
-				tary = player2.legs[3];
+				tarx = (unsigned int)player2.legs[2];
+				tary = (unsigned int)player2.legs[3];
 			}
-		else
-		{
-			tarx = player.legs[2];
-			tary = player.legs[3];
-		}
-
-		parts[i].tmp2 = 1;
+			parts[i].tmp2 = 1;
 	}
 	else
+	{
+		if (player.spwn)
+		{
+			tarx = (unsigned int)player.legs[2];
+			tary = (unsigned int)player.legs[3];
+			parts[i].tmp2 = 1;
+		}
 		if (player2.spwn)
 		{
-			tarx = player2.legs[2];
-			tary = player2.legs[3];
-
+			tarx = (unsigned int)player2.legs[2];
+			tary = (unsigned int)player2.legs[3];
 			parts[i].tmp2 = 1;
 		}
+	}
 
 	switch (parts[i].tmp2)
 	{
@@ -51,9 +51,10 @@ int update_FIGH(UPDATE_FUNC_ARGS)
 					figh->comm = (int)figh->comm | 0x08;
 			}
 			else
-				if (tarx<x )
+				if (tarx<x)
 				{
-					if(!eval_move(PT_DUST, figh->legs[4]-10, figh->legs[5]+6, NULL))
+					if(!(eval_move(PT_DUST, figh->legs[4]-10, figh->legs[5]+6, NULL) 
+					  && eval_move(PT_DUST, figh->legs[4]-10, figh->legs[5]+3, NULL)))
 						figh->comm = 0x01;
 					else
 						figh->comm = 0x02;
@@ -65,7 +66,8 @@ int update_FIGH(UPDATE_FUNC_ARGS)
 				}
 				else
 				{ 
-					if (!eval_move(PT_DUST, figh->legs[12]+10, figh->legs[13]+6, NULL))
+					if (!(eval_move(PT_DUST, figh->legs[12]+10, figh->legs[13]+6, NULL)
+					   && eval_move(PT_DUST, figh->legs[12]+10, figh->legs[13]+3, NULL)))
 						figh->comm = 0x02;
 					else
 						figh->comm = 0x01;