sheepy-clone: comparison hedgewars/uAIMisc.pas

equal deleted inserted replaced

-:4aff2da0d0b3
+:76a9274f280f
 // 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;
+exit(false);
 end;
 TestCollExcludingMe:= TestColl(x, y, r)
 end;
 function TestColl(x, y, r: LongInt): boolean; inline;
 var b: boolean;
 begin
-TestColl:= 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;
+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;
+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;
+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;
+exit(true);
 TestColl:= false;
 end;
 function TestCollWithLand(x, y, r: LongInt): boolean; inline;
 var b: boolean;
 begin
-TestCollWithLand:= true;
 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;
+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);
 if b then
-exit;
+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);
 if b then
-exit;
+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);
 if b then
-exit;
+exit(true);
 TestCollWithLand:= false;
 end;
 function TraceFall(eX, eY: LongInt; x, y, dX, dY: Real; r: LongWord): LongInt;
 begin
 if 0.4 < dY then
 begin
 dmg := 1 + trunc((abs(dY) - 0.4) * 70);
 if dmg >= 1 then
-begin
+exit(dmg);
-TraceFall:= dmg;
+end;
-exit
+exit(0)
-end;
-end;
-TraceFall:= 0;
-exit
 end;
 if (y > cWaterLine) or (x > 4096) or (x < 0) then
-begin
+exit(-1);
-// 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
 if 0.4 < dY then
 begin
 dmg := 1 + trunc((abs(dY) - 0.4) * 70);
 if dmg >= 1 then
-begin
+exit(dmg);
-TraceShoveFall:= dmg;
+end;
-exit
+exit(0)
-end;
-end;
-TraceShoveFall:= 0;
-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(-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;
 GoInfo.Ticks:= 0;
 GoInfo.JumpType:= jmpNone;
 bX:= hwRound(Gear^.X);
 bY:= hwRound(Gear^.Y);
 case JumpType of
-jmpNone: exit;
+jmpNone: exit(false);
 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;
+exit(false);
 jmpLJump:
 begin
 if TestCollisionYwithGear(Gear, -1) <> 0 then
 if not TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) then
 Gear^.dY:= -_0_15;
 Gear^.dX:= SignAs(_0_15, Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping
 end
 else
-exit
+exit(false)
 end
 end;
 repeat
 if not (hwRound(Gear^.Y) + cHHRadius < cWaterLine) then
-exit;
+exit(false);
 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
 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;
+exit(false);
 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
 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
-HHJump:= true;
 GoInfo.JumpType:= jmpHJump;
-inc(GoInfo.Ticks, 300 + 300) // 300 before jump, 300 after
+inc(GoInfo.Ticks, 300 + 300); // 300 before jump, 300 after
-end;
+exit(true)
+end;
 jmpLJump:
 if abs(bX - hwRound(Gear^.X)) > 30 then
 begin
-HHJump:= true;
 GoInfo.JumpType:= jmpLJump;
-inc(GoInfo.Ticks, 300 + 300) // 300 before jump, 300 after
+inc(GoInfo.Ticks, 300 + 300); // 300 before jump, 300 after
-end
+exit(true)
-end;
+end
-exit
+end;
-end;
+exit(false)
+end;
 end;
 until false
 end;
 function HHGo(Gear, AltGear: PGear; var GoInfo: TGoInfo): boolean;
 GoInfo.JumpType:= jmpNone;
 repeat
 pX:= hwRound(Gear^.X);
 pY:= hwRound(Gear^.Y);
 if pY + cHHRadius >= cWaterLine then
-exit;
+exit(false);
 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
+exit(false)
 end;
 Gear^.Y:= Gear^.Y + Gear^.dY;
 if hwRound(Gear^.Y) > pY then
 inc(GoInfo.FallPix);
 if TestCollisionYwithGear(Gear, 1) <> 0 then
 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
 HHGo:= true;
-exit
+exit(false)
 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;
+exit(false);
 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;
 end
 end
 end
 end;
 if (pX <> hwRound(Gear^.X)) and ((Gear^.State and gstMoving) = 0) then
-begin
+exit(true)
-HHGo:= true;
-exit;
-end;
 until (pX = hwRound(Gear^.X)) and (pY = hwRound(Gear^.Y)) and ((Gear^.State and gstMoving) = 0);
 HHJump(AltGear, jmpHJump, GoInfo);
 end;
 function AIrndSign(num: LongInt): LongInt;

changeset 7041	76a9274f280f
parent 6990	40e5af28d026
child 7154	56e329edf4b8