hedgewars/uAIMisc.pas
changeset 6778 a9c6457dca29
parent 6777 fb71556205f4
child 6782 33009ac4de80
--- a/hedgewars/uAIMisc.pas	Mon Mar 12 23:46:28 2012 +0400
+++ b/hedgewars/uAIMisc.pas	Tue Mar 13 00:05:03 2012 -0400
@@ -189,12 +189,17 @@
 function RatePlace(Gear: PGear): LongInt;
 var i, r: LongInt;
     rate: LongInt;
+    gX, gY: real;
 begin
+gX:= hwFloat2Float(Gear^.X);
+gY:= hwFloat2Float(Gear^.Y);
 rate:= 0;
 for i:= 0 to Pred(bonuses.Count) do
     with bonuses.ar[i] do
         begin
-        r:= hwRound(Distance(Gear^.X - int2hwFloat(X), Gear^.Y - int2hwFloat(Y)));
+        r:= Radius;
+        if abs(gX-X)+abs(gY-Y) < Radius then
+            r:= trunc(sqrt(sqr(gX - X)+sqr(gY - Y)));
         if r < 15 then
                 inc(rate, Score * Radius)
         else if r < Radius then
@@ -361,7 +366,7 @@
             end;
         if dmg > 0 then
             begin
-            if (Flags and 1 <> 0) and TraceShoveDrown(Me, Point.x, Point.y, dX, dY) then
+            if (Flags and 1 <> 0) and TraceShoveDrown(Me, Point.x, Point.y-2, dX, dY) then
                 if Score > 0 then
                     inc(rate, KillScore + Score div 10)   // Add a bit of a bonus for bigger hog drownings
                 else