hedgewars: comparison hedgewars/uAIMisc.pas

equal deleted inserted replaced

-:dcd248e04f3d
+:ed789a7ef68d
 KnownExplosion.Radius:= r
 end;
 function RatePlace(Gear: PGear): LongInt;
 var i, r: LongInt;
-Result: LongInt;
+rate: LongInt;
 begin
-Result:= 0;
+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)));
 		if r < Radius then
-			inc(Result, Score * (Radius - r))
+			inc(rate, Score * (Radius - r))
 		end;
-	RatePlace:= Result
+	RatePlace:= rate;
 end;
 // Wrapper to test various approaches.  If it works reasonably, will just replace.
 // Right now, converting to hwFloat is a tad inefficient since the x/y were hwFloat to begin with...
 function TestCollExcludingMe(Me: PGear; x, y, r: LongInt): boolean;
 if b then exit(true);
 TestColl:=(((x+r) and LAND_WIDTH_MASK) = 0)and(((y+r) and LAND_HEIGHT_MASK) = 0) and (Land[y+r, x+r] <> 0)
 end;
 function RateExplosion(Me: PGear; x, y, r: LongInt): LongInt;
-var i, dmg, Result: LongInt;
+var i, dmg, rate: LongInt;
 begin
-Result:= 0;
+rate:= 0;
 // add our virtual position
 with Targets.ar[Targets.Count] do
 begin
 Point.x:= hwRound(Me^.X);
 Point.y:= hwRound(Me^.Y);
 dmg:= r + cHHRadius div 2 - hwRound(DistanceI(Point.x - x, Point.y - y));
 if dmg > 0 then
 begin
 dmg:= min(dmg div 2, r);
 if dmg >= abs(Score) then
-if Score > 0 then inc(Result, KillScore)
+if Score > 0 then inc(rate, KillScore)
-else dec(Result, KillScore * friendlyfactor div 100)
+else dec(rate, KillScore * friendlyfactor div 100)
 else
-if Score > 0 then inc(Result, dmg)
+if Score > 0 then inc(rate, dmg)
-else dec(Result, dmg * friendlyfactor div 100)
+else dec(rate, dmg * friendlyfactor div 100)
 end;
 end;
-RateExplosion:= Result * 1024
+RateExplosion:= rate * 1024;
 end;
 function RateShove(Me: PGear; x, y, r, power: LongInt): LongInt;
-var i, dmg, Result: LongInt;
+var i, dmg, rate: LongInt;
 begin
-Result:= 0;
+rate:= 0;
 for i:= 0 to Pred(Targets.Count) do
 with Targets.ar[i] do
 begin
 dmg:= r - hwRound(DistanceI(Point.x - x, Point.y - y));
 if dmg > 0 then
 begin
 if power >= abs(Score) then
-if Score > 0 then inc(Result, KillScore)
+if Score > 0 then inc(rate, KillScore)
-else dec(Result, KillScore * friendlyfactor div 100)
+else dec(rate, KillScore * friendlyfactor div 100)
 else
-if Score > 0 then inc(Result, power)
+if Score > 0 then inc(rate, power)
-else dec(Result, power * friendlyfactor div 100)
+else dec(rate, power * friendlyfactor div 100)
 end;
 end;
-RateShove:= Result * 1024
+RateShove:= rate * 1024
 end;
 function RateShotgun(Me: PGear; x, y: LongInt): LongInt;
 const
 REUSE_BONUS = 1.35;
-var i, dmg, Result: LongInt;
+var i, dmg, rate: LongInt;
 begin
-Result:= 0;
+rate:= 0;
 // add our virtual position
 with Targets.ar[Targets.Count] do
 begin
 Point.x:= hwRound(Me^.X);
 Point.y:= hwRound(Me^.Y);
 dmg:= min(cHHRadius + cShotgunRadius - hwRound(DistanceI(Point.x - x, Point.y - y)), 25);
 dmg := round(dmg * REUSE_BONUS);
 if dmg > 0 then
 begin
 if dmg >= abs(Score) then dmg := KillScore;
-if Score > 0 then inc(Result, dmg)
+if Score > 0 then inc(rate, dmg)
-else dec(Result, dmg * friendlyfactor div 100);
+else dec(rate, dmg * friendlyfactor div 100);
 end;
 end;
-RateShotgun:= Result * 1024
+RateShotgun:= rate * 1024;
 end;
 function HHJump(Gear: PGear; JumpType: TJumpType; var GoInfo: TGoInfo): boolean;
 var bX, bY: LongInt;
-Result: boolean;
+bRes: boolean;
 begin
-Result:= false;
+bRes:= false;
 GoInfo.Ticks:= 0;
 GoInfo.FallPix:= 0;
 GoInfo.JumpType:= jmpNone;
 bX:= hwRound(Gear^.X);
 bY:= hwRound(Gear^.Y);
 case JumpType of
-jmpNone: exit(Result);
+jmpNone: exit(bRes);
 jmpHJump: if not TestCollisionYwithGear(Gear, -1) then
 begin
 Gear^.dY:= -_0_2;
 SetLittle(Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
-end else exit(Result);
+end else exit(bRes);
 jmpLJump: begin
 if not TestCollisionYwithGear(Gear, -1) then
 if not TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - int2hwFloat(2) else
 if not TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - _1;
 if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX))
 or   TestCollisionYwithGear(Gear, -1)) then
 begin
 Gear^.dY:= -_0_15;
 Gear^.dX:= SignAs(_0_15, Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping
-end else exit(Result)
+end else exit(bRes)
 end
 end;
 repeat
-if not (hwRound(Gear^.Y) + cHHRadius < cWaterLine) then exit(Result);
+if not (hwRound(Gear^.Y) + cHHRadius < cWaterLine) then exit(bRes);
 if (Gear^.State and gstMoving) <> 0 then
 begin
 if (GoInfo.Ticks = 350) then
 if (not (hwAbs(Gear^.dX) > cLittle)) and (Gear^.dY < -_0_02) then
 begin
 end;
 if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then SetLittle(Gear^.dX);
 Gear^.X:= Gear^.X + Gear^.dX;
 inc(GoInfo.Ticks);
 Gear^.dY:= Gear^.dY + cGravity;
-if Gear^.dY > _0_4 then exit(Result);
+if Gear^.dY > _0_4 then exit(bRes);
 if (Gear^.dY.isNegative)and TestCollisionYwithGear(Gear, -1) then Gear^.dY:= _0;
 Gear^.Y:= Gear^.Y + Gear^.dY;
 if (not Gear^.dY.isNegative)and TestCollisionYwithGear(Gear, 1) then
 begin
 Gear^.State:= Gear^.State and not (gstMoving or gstHHJumping);
 Gear^.dY:= _0;
 case JumpType of
 jmpHJump: if bY - hwRound(Gear^.Y) > 5 then
 begin
-Result:= true;
+bRes:= true;
 GoInfo.JumpType:= jmpHJump;
 inc(GoInfo.Ticks, 300 + 300) // 300 before jump, 300 after
 end;
 jmpLJump: if abs(bX - hwRound(Gear^.X)) > 30 then
 begin
-Result:= true;
+bRes:= true;
 GoInfo.JumpType:= jmpLJump;
 inc(GoInfo.Ticks, 300 + 300) // 300 before jump, 300 after
 end;
 end;
-exit(Result)
+exit(bRes)
 end;
 end;
 until false
 end;
 function HHGo(Gear, AltGear: PGear; var GoInfo: TGoInfo): boolean;
 var pX, pY: LongInt;
-Result: boolean;
+bRes: boolean;
 begin
-Result:= false;
+bRes:= false;
 AltGear^:= Gear^;
 GoInfo.Ticks:= 0;
 GoInfo.FallPix:= 0;
 GoInfo.JumpType:= jmpNone;
 Gear^.dY:= Gear^.dY + cGravity;
 if Gear^.dY > _0_4 then
 begin
 Goinfo.FallPix:= 0;
 HHJump(AltGear, jmpLJump, GoInfo); // try ljump instead of fall with damage
-exit(Result)
+exit(bRes)
 end;
 Gear^.Y:= Gear^.Y + Gear^.dY;
 if hwRound(Gear^.Y) > pY then inc(GoInfo.FallPix);
 if TestCollisionYwithGear(Gear, 1) then
 begin
 inc(GoInfo.Ticks, 410);
 Gear^.State:= Gear^.State and not (gstMoving or gstHHJumping);
 Gear^.dY:= _0;
-Result:= true;
+bRes:= true;
 HHJump(AltGear, jmpLJump, GoInfo); // try ljump instead of fall
-exit(Result)
+exit(bRes)
 end;
 continue
 end;
 if (Gear^.Message and gm_Left  )<>0 then Gear^.dX:= -cLittle else
-if (Gear^.Message and gm_Right )<>0 then Gear^.dX:=  cLittle else exit(Result);
+if (Gear^.Message and gm_Right )<>0 then Gear^.dX:=  cLittle else exit(bRes);
 if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
 begin
 if not (TestCollisionXwithXYShift(Gear, _0, -6, hwSign(Gear^.dX))
 or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
 if not (TestCollisionXwithXYShift(Gear, _0, -5, hwSign(Gear^.dX))
 end;
 if (pX <> hwRound(Gear^.X)) and ((Gear^.State and gstMoving) = 0) then
 exit(true);
 until (pX = hwRound(Gear^.X)) and (pY = hwRound(Gear^.Y)) and ((Gear^.State and gstMoving) = 0);
 HHJump(AltGear, jmpHJump, GoInfo);
-HHGo:= Result
+HHGo:= bRes;
 end;
 function AIrndSign(num: LongInt): LongInt;
 begin
 if random(2) = 0 then AIrndSign:=   num

changeset 2695	ed789a7ef68d
parent 2616	6e2b341dc408
child 2716	b9ca1bfca24f