hedgewars-draft: comparison hedgewars/uAIMisc.pas

equal deleted inserted replaced

-:4c35e9cf6057
+:40e5af28d026
 // 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; inline;
 var MeX, MeY: LongInt;
 begin
+TestCollExcludingMe:= false;
 if ((x and LAND_WIDTH_MASK) = 0) and ((y and LAND_HEIGHT_MASK) = 0) then
 begin
 MeX:= hwRound(Me^.X);
 MeY:= hwRound(Me^.Y);
 // We are still inside the hog. Skip radius test
 if ((((x-MeX)*(x-MeX)) + ((y-MeY)*(y-MeY))) < 256) and ((Land[y, x] and $FF00) = 0) then
-exit(false);
+exit;
 end;
-exit(TestColl(x, y, r))
+TestCollExcludingMe:= TestColl(x, y, r)
 end;
 function TestColl(x, y, r: LongInt): boolean; inline;
 var b: boolean;
 begin
-b:= (((x-r) and LAND_WIDTH_MASK) = 0)and(((y-r) and LAND_HEIGHT_MASK) = 0) and (Land[y-r, x-r] <> 0);
+TestColl:= true;
-if b then
-exit(true);
+b:= (((x-r) and LAND_WIDTH_MASK) = 0) and (((y-r) and LAND_HEIGHT_MASK) = 0) and (Land[y-r, x-r] <> 0);
+if b then
+exit;
-b:=(((x-r) and LAND_WIDTH_MASK) = 0)and(((y+r) and LAND_HEIGHT_MASK) = 0) and (Land[y+r, x-r] <> 0);
+b:= (((x-r) and LAND_WIDTH_MASK) = 0) and (((y+r) and LAND_HEIGHT_MASK) = 0) and (Land[y+r, x-r] <> 0);
 if b then
-exit(true);
+exit;
-b:=(((x+r) and LAND_WIDTH_MASK) = 0)and(((y-r) and LAND_HEIGHT_MASK) = 0) and (Land[y-r, x+r] <> 0);
+b:= (((x+r) and LAND_WIDTH_MASK) = 0) and (((y-r) and LAND_HEIGHT_MASK) = 0) and (Land[y-r, x+r] <> 0);
 if b then
-exit(true);
+exit;
-TestColl:=(((x+r) and LAND_WIDTH_MASK) = 0)and(((y+r) and LAND_HEIGHT_MASK) = 0) and (Land[y+r, x+r] <> 0)
+b:= (((x+r) and LAND_WIDTH_MASK) = 0) and (((y+r) and LAND_HEIGHT_MASK) = 0) and (Land[y+r, x+r] <> 0);
+if b then
+exit;
+TestColl:= false;
 end;
 function TestCollWithLand(x, y, r: LongInt): boolean; inline;
 var b: boolean;
 begin
-b:= (((x-r) and LAND_WIDTH_MASK) = 0)and(((y-r) and LAND_HEIGHT_MASK) = 0) and (Land[y-r, x-r] > 255);
+TestCollWithLand:= true;
-if b then
-exit(true);
-b:=(((x-r) and LAND_WIDTH_MASK) = 0)and(((y+r) and LAND_HEIGHT_MASK) = 0) and (Land[y+r, x-r] > 255);
+b:= (((x-r) and LAND_WIDTH_MASK) = 0) and (((y-r) and LAND_HEIGHT_MASK) = 0) and (Land[y-r, x-r] > 255);
 if b then
-exit(true);
+exit;
-b:=(((x+r) and LAND_WIDTH_MASK) = 0)and(((y-r) and LAND_HEIGHT_MASK) = 0) and (Land[y-r, x+r] > 255);
+b:= (((x-r) and LAND_WIDTH_MASK) = 0) and (((y+r) and LAND_HEIGHT_MASK) = 0) and (Land[y+r, x-r] > 255);
 if b then
-exit(true);
+exit;
-TestCollWithLand:=(((x+r) and LAND_WIDTH_MASK) = 0) and (((y+r) and LAND_HEIGHT_MASK) = 0) and (Land[y+r, x+r] > 255)
+b:= (((x+r) and LAND_WIDTH_MASK) = 0) and (((y-r) and LAND_HEIGHT_MASK) = 0) and (Land[y-r, x+r] > 255);
+if b then
+exit;
+b:= (((x+r) and LAND_WIDTH_MASK) = 0) and (((y+r) and LAND_HEIGHT_MASK) = 0) and (Land[y+r, x+r] > 255);
+if b then
+exit;
+TestCollWithLand:= false;
 end;
 function TraceFall(eX, eY: LongInt; x, y, dX, dY: Real; r: LongWord): LongInt;
 var skipLandCheck: boolean;
 rCorner: real;
 if x - eX < 0 then dX:= -dX;
 if y - eY < 0 then dY:= -dY;
 // ok. attempt approximate search for an unbroken trajectory into water.  if it continues far enough, assume out of map
 rCorner:= r * 0.75;
 while true do
 begin
 x:= x + dX;
 y:= y + dY;
 dY:= dY + cGravityf;
 skipLandCheck:= skipLandCheck and (r <> 0) and (abs(eX-x) + abs(eY-y) < r) and ((abs(eX-x) < rCorner) or (abs(eY-y) < rCorner));
 if not skipLandCheck and TestCollWithLand(trunc(x), trunc(y), cHHRadius) then
 begin
 if 0.4 < dY then
+begin
+dmg := 1 + trunc((abs(dY) - 0.4) * 70);
+if dmg >= 1 then
 begin
-dmg := 1 + trunc((abs(dY) - 0.4) * 70);
+TraceFall:= dmg;
-if dmg >= 1 then exit(dmg)
+exit
 end;
-exit(0)
+end;
-end;
+TraceFall:= 0;
-if (y > cWaterLine) or (x > 4096) or (x < 0) then exit(-1); // returning -1 for drowning so it can be considered in the Rate routine
+exit
 end;
+if (y > cWaterLine) or (x > 4096) or (x < 0) then
+begin
+// returning -1 for drowning so it can be considered in the Rate routine
+TraceFall:= -1;
+exit;
+end;
+end;
 end;
 function TraceShoveFall(Me: PGear; x, y, dX, dY: Real): LongInt;
 var dmg: LongInt;
 begin
 while true do
 begin
 x:= x + dX;
 y:= y + dY;
 dY:= dY + cGravityf;
 // consider adding dX/dY calc here for fall damage
 if TestCollExcludingMe(Me, trunc(x), trunc(y), cHHRadius) then
 begin
 if 0.4 < dY then
+begin
+dmg := 1 + trunc((abs(dY) - 0.4) * 70);
+if dmg >= 1 then
 begin
-dmg := 1 + trunc((abs(dY) - 0.4) * 70);
+TraceShoveFall:= dmg;
-if dmg >= 1 then exit(dmg)
+exit
 end;
-exit(0)
+end;
-end;
+TraceShoveFall:= 0;
-if (y > cWaterLine) or (x > 4096) or (x < 0) then exit(-1); // returning -1 for drowning so it can be considered in the Rate routine
+exit
 end;
+if (y > cWaterLine) or (x > 4096) or (x < 0) then
+begin
+// returning -1 for drowning so it can be considered in the Rate routine
+TraceShoveFall:= -1;
+exit;
+end;
+end;
 end;
 // Flags are not defined yet but 1 for checking drowning and 2 for assuming land erasure.
 function RateExplosion(Me: PGear; x, y, r: LongInt): LongInt;
 begin
 RateHammer:= rate * 1024;
 end;
 function HHJump(Gear: PGear; JumpType: TJumpType; var GoInfo: TGoInfo): boolean;
 var bX, bY: LongInt;
-bRes: boolean;
+begin
-begin
+HHJump:= false;
-bRes:= false;
 GoInfo.Ticks:= 0;
 GoInfo.JumpType:= jmpNone;
 bX:= hwRound(Gear^.X);
 bY:= hwRound(Gear^.Y);
 case JumpType of
-jmpNone:
+jmpNone: exit;
-exit(bRes);
 jmpHJump:
 if TestCollisionYwithGear(Gear, -1) = 0 then
 begin
 Gear^.dY:= -_0_2;
 SetLittle(Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
 end
 else
-exit(bRes);
+exit;
 jmpLJump:
 begin
 if TestCollisionYwithGear(Gear, -1) <> 0 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))
+if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) or
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then
+(TestCollisionYwithGear(Gear, -1) <> 0)) then
 begin
 Gear^.dY:= -_0_15;
 Gear^.dX:= SignAs(_0_15, Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping
 end
 else
-exit(bRes)
+exit
 end
 end;
 repeat
 if not (hwRound(Gear^.Y) + cHHRadius < cWaterLine) then
-exit(bRes);
+exit;
 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
 Gear^.dY:= -_0_25;
 Gear^.dX:= SignAs(_0_02, Gear^.dX)
 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(bRes);
+exit;
-if (Gear^.dY.isNegative)and (TestCollisionYwithGear(Gear, -1) <> 0) then
+if (Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, -1) <> 0) then
 Gear^.dY:= _0;
 Gear^.Y:= Gear^.Y + Gear^.dY;
-if (not Gear^.dY.isNegative)and (TestCollisionYwithGear(Gear, 1) <> 0) then
+if (not Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, 1) <> 0) 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
-bRes:= true;
+HHJump:= true;
 GoInfo.JumpType:= jmpHJump;
 inc(GoInfo.Ticks, 300 + 300) // 300 before jump, 300 after
 end;
-jmpLJump: if abs(bX - hwRound(Gear^.X)) > 30 then
+jmpLJump:
-begin
+if abs(bX - hwRound(Gear^.X)) > 30 then
-bRes:= true;
+begin
-GoInfo.JumpType:= jmpLJump;
+HHJump:= true;
-inc(GoInfo.Ticks, 300 + 300) // 300 before jump, 300 after
+GoInfo.JumpType:= jmpLJump;
-end
+inc(GoInfo.Ticks, 300 + 300) // 300 before jump, 300 after
-end;
+end
-exit(bRes)
+end;
-end;
+exit
 end;
+end;
 until false
 end;
 function HHGo(Gear, AltGear: PGear; var GoInfo: TGoInfo): boolean;
 var pX, pY: LongInt;
 begin
+HHGo:= false;
 AltGear^:= Gear^;
 GoInfo.Ticks:= 0;
 GoInfo.FallPix:= 0;
 GoInfo.JumpType:= jmpNone;
 repeat
 pX:= hwRound(Gear^.X);
 pY:= hwRound(Gear^.Y);
 if pY + cHHRadius >= cWaterLine then
-exit(false);
+exit;
 if (Gear^.State and gstMoving) <> 0 then
 begin
 inc(GoInfo.Ticks);
 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(false)
+exit
 end;
 Gear^.Y:= Gear^.Y + Gear^.dY;
 if hwRound(Gear^.Y) > pY then
 inc(GoInfo.FallPix);
 if TestCollisionYwithGear(Gear, 1) <> 0 then
 begin
 inc(GoInfo.Ticks, 410);
 Gear^.State:= Gear^.State and not (gstMoving or gstHHJumping);
 Gear^.dY:= _0;
 HHJump(AltGear, jmpLJump, GoInfo); // try ljump instead of fall
-exit(true)
+HHGo:= true;
+exit
 end;
 continue
 end;
 if (Gear^.Message and gmLeft  )<>0 then
 Gear^.dX:= -cLittle
 else
 if (Gear^.Message and gmRight )<>0 then
 Gear^.dX:=  cLittle
 else
-exit(false);
+exit;
 if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
 begin
 if not (TestCollisionXwithXYShift(Gear, _0, -6, hwSign(Gear^.dX))
 or (TestCollisionYwithGear(Gear, -1) <> 0)) then
 Gear^.Y:= Gear^.Y - _1;
 or (TestCollisionYwithGear(Gear, -1) <> 0)) then
 Gear^.Y:= Gear^.Y - _1;
 end;
 if not TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
 begin
 Gear^.X:= Gear^.X + int2hwFloat(hwSign(Gear^.dX));
 inc(GoInfo.Ticks, cHHStepTicks)
 end;
+// too scared to reformat this part
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y + _1;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y + _1;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y + _1;
 end
 end
 end
 end;
 if (pX <> hwRound(Gear^.X)) and ((Gear^.State and gstMoving) = 0) then
-exit(true);
+begin
+HHGo:= true;
+exit;
+end;
 until (pX = hwRound(Gear^.X)) and (pY = hwRound(Gear^.Y)) and ((Gear^.State and gstMoving) = 0);
 HHJump(AltGear, jmpHJump, GoInfo);
-HHGo:= false;
 end;
 function AIrndSign(num: LongInt): LongInt;
 begin
 if random(2) = 0 then

changeset 6990	40e5af28d026
parent 6986	409dd3851309
child 7041	76a9274f280f