hedgewars: comparison hedgewars/uAIAmmoTests.pas

equal deleted inserted replaced

-:83cef0f08a86
+:566788d32e52
 function TestTeleport(Me: PGear; Targ: TPoint; Level: LongInt; var ap: TAttackParams): LongInt;
 var
 i, failNum: longword;
-begin
+maxTop: longword;
+begin
+TestTeleport := BadTurn;
 Level:= Level; // avoid compiler hint
 FillBonuses(true, [gtCase]);
 if bonuses.Count = 0 then begin
 if Me^.Health <= 100  then begin
-ap.AttackPutX := Targ.X;
+	  maxTop := Targ.Y - cHHRadius * 2;
-ap.AttackPutY := topY + cHHRadius*2;
+	  while(not TestColl(Targ.X, maxTop, cHHRadius) and (maxTop > topY)) do
-TestTeleport := Targ.Y - topY;
+	  	dec(maxTop, cHHRadius*2);
+	  if(not TestColl(Targ.X, maxTop + cHHRadius, cHHRadius)) then begin
+ap.AttackPutX := Targ.X;
+ap.AttackPutY := maxTop + cHHRadius;
+TestTeleport := Targ.Y - maxTop;
+	  end;
 end
-else
-TestTeleport := BadTurn;
 end
 else begin
 	failNum := 0;
 repeat
 		i := random(bonuses.Count);
 	if failNum < bonuses.Count*2 then begin
 	  ap.AttackPutX := bonuses.ar[i].X;
 	  ap.AttackPutY := bonuses.ar[i].Y - cHHRadius - bonuses.ar[i].Radius;
 	  TestTeleport := 0;
 	end
-else
-	  TestTeleport := BadTurn;
 end;
 end;
 end.