sheepy-clone: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:20ef5bf0dc7f
+:d088be5ecdcb
 begin
 AllInactive := false;
 Gear^.Y := Gear^.Y + cDrownSpeed;
 Gear^.X := Gear^.X + Gear^.dX * cDrownSpeed;
 // Create some bubbles (0.5% might be better but causes too few bubbles sometimes)
-if ((not SuddenDeathDmg and (WaterOpacity < $FF))
+if (((not SuddenDeathDmg) and (WaterOpacity < $FF))
 or (SuddenDeathDmg and (SDWaterOpacity < $FF))) and ((GameTicks and $1F) = 0) then
 if (Gear^.Kind = gtHedgehog) and (Random(4) = 0) then
 AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius, vgtBubble)
 else if Random(12) = 0 then
 AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius, vgtBubble);
-if (not SuddenDeathDmg and (WaterOpacity > $FE))
+if ((not SuddenDeathDmg) and (WaterOpacity > $FE))
 or (SuddenDeathDmg and (SDWaterOpacity > $FE))
 or (hwRound(Gear^.Y) > Gear^.Radius + cWaterLine + cVisibleWater) then
 DeleteGear(Gear);
 end;
 or ((tdX.QWordValue + tdY.QWordValue) > _0_2.QWordValue)) then
 begin
 Gear^.dX := tdY*Gear^.Elasticity*Gear^.Friction;
 Gear^.dY := tdX*Gear^.Elasticity;
 //*Gear^.Friction;
-Gear^.dY.isNegative := not tdY.isNegative;
+Gear^.dY.isNegative := (not tdY.isNegative);
 isFalling := false;
 Gear^.AdvBounce := 10;
 end;
 if Gear^.AdvBounce > 1 then
 doStepFallingGear(Gear);
 CalcRotationDirAngle(Gear);
 if (Gear^.State and gstCollision) <> 0 then
 begin
 kick:= hwRound((hwAbs(Gear^.dX)+hwAbs(Gear^.dY)) * _20);
-Gear^.dY.isNegative:= not Gear^.dY.isNegative;
+Gear^.dY.isNegative:= (not Gear^.dY.isNegative);
-Gear^.dX.isNegative:= not Gear^.dX.isNegative;
+Gear^.dX.isNegative:= (not Gear^.dX.isNegative);
 AmmoShove(Gear, 0, kick);
 for i:= 15 + kick div 10 downto 0 do
 begin
 particle := AddVisualGear(hwRound(Gear^.X) + Random(25), hwRound(Gear^.Y) + Random(25), vgtDust);
 if particle <> nil then
 if Gear^.dY.isNegative then
 if TestCollisionY(Gear, -1) then
 Gear^.dY := _0;
-if not Gear^.dY.isNegative then
+if (not Gear^.dY.isNegative) then
 if TestCollisionY(Gear, 1) then
 begin
 Gear^.dY := - Gear^.dY * Gear^.Elasticity;
 if Gear^.dY > - _1div1024 then
 begin
 begin
 DrawTunnel(oX, oY, Gear^.dX, Gear^.dY, 82 - i, 1);
 dec(Gear^.Health, Gear^.Damage);
 Gear^.Damage := 0
 end;
-if ((Gear^.State and gstDrowning) <> 0) and (Gear^.Damage < Gear^.Health) and ((not SuddenDeathDmg and (WaterOpacity < $FF)) or (SuddenDeathDmg and (SDWaterOpacity < $FF))) then
+if ((Gear^.State and gstDrowning) <> 0) and (Gear^.Damage < Gear^.Health) and (((not SuddenDeathDmg) and (WaterOpacity < $FF)) or (SuddenDeathDmg and (SDWaterOpacity < $FF))) then
 begin
 for i:=(Gear^.Health - Gear^.Damage) * 4 downto 0 do
 begin
 if Random(6) = 0 then
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble);
 end
 else if (GameTicks and $3F) = 25 then
 doStepFallingGear(Gear);
 if (Gear^.Health = 0) then
 begin
-if not Gear^.dY.isNegative and (Gear^.dY > _0_2) and (TestCollisionYwithGear(Gear, 1) <> 0) then
+if (not Gear^.dY.isNegative) and (Gear^.dY > _0_2) and (TestCollisionYwithGear(Gear, 1) <> 0) then
 inc(Gear^.Damage, hwRound(Gear^.dY * _70))
-else if not Gear^.dX.isNegative and (Gear^.dX > _0_2) and TestCollisionXwithGear(Gear, 1) then
+else if (not Gear^.dX.isNegative) and (Gear^.dX > _0_2) and TestCollisionXwithGear(Gear, 1) then
 inc(Gear^.Damage, hwRound(Gear^.dX * _70))
 else if Gear^.dY.isNegative and (Gear^.dY < -_0_2) and (TestCollisionYwithGear(Gear, -1) <> 0) then
 inc(Gear^.Damage, hwRound(Gear^.dY * -_70))
 else if Gear^.dX.isNegative and (Gear^.dX < -_0_2) and TestCollisionXwithGear(Gear, -1) then
 inc(Gear^.Damage, hwRound(Gear^.dX * -_70));
 if ((Gear^.dX.QWordValue <> 0)
 or (Gear^.dY.QWordValue <> 0))  then
 begin
 DeleteCI(Gear);
 AllInactive := false;
-if not Gear^.dY.isNegative and (Gear^.dY > _0_2) and (TestCollisionYwithGear(Gear, 1) <> 0) then
+if (not Gear^.dY.isNegative) and (Gear^.dY > _0_2) and (TestCollisionYwithGear(Gear, 1) <> 0) then
 begin
 Gear^.State := Gear^.State or gsttmpFlag;
 inc(Gear^.Damage, hwRound(Gear^.dY * _70));
 for i:= min(12, hwRound(Gear^.dY*_10)) downto 0 do
 begin
 particle := AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12,vgtDust);
 if particle <> nil then
 particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480)
 end
 end
-else if not Gear^.dX.isNegative and (Gear^.dX > _0_2) and TestCollisionXwithGear(Gear, 1) then
+else if (not Gear^.dX.isNegative) and (Gear^.dX > _0_2) and TestCollisionXwithGear(Gear, 1) then
 inc(Gear^.Damage, hwRound(Gear^.dX * _70))
 else if Gear^.dY.isNegative and (Gear^.dY < -_0_2) and (TestCollisionYwithGear(Gear, -1) <> 0) then
 inc(Gear^.Damage, hwRound(Gear^.dY * -_70))
 Gear^.dX:= _0_08;
 end;
 if Gear^.dX.QWordValue = 0 then AddGearCI(Gear)
 end; *)
-if not Gear^.dY.isNegative and (Gear^.dY < _0_001) and (TestCollisionYwithGear(Gear, 1) <> 0) then
+if (not Gear^.dY.isNegative) and (Gear^.dY < _0_001) and (TestCollisionYwithGear(Gear, 1) <> 0) then
 Gear^.dY := _0;
 if hwAbs(Gear^.dX) < _0_001 then
 Gear^.dX := _0;
 if (Gear^.Health > 0) and ((Gear^.Health * 100 div cBarrelHealth) < random(90)) and ((GameTicks and $FF) = 0) then
 sticky: Boolean;
 vgt: PVisualGear;
 tdX,tdY: HWFloat;
 begin
 sticky:= (Gear^.State and gsttmpFlag) <> 0;
-if not sticky then AllInactive := false;
+if (not sticky) then AllInactive := false;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 AllInactive := false;
 else
 begin
 gX := hwRound(Gear^.X);
 gY := hwRound(Gear^.Y);
 // Standard fire
-if not sticky then
+if (not sticky) then
 begin
 if ((GameTicks and $1) = 0) then
 begin
 Gear^.Radius := 7;
 tdX:= Gear^.dX;
 end;
 if Gear^.Health = 0 then
 begin
 gX := hwRound(Gear^.X);
 gY := hwRound(Gear^.Y);
-if not sticky then
+if (not sticky) then
 begin
 if ((GameTicks and $3) = 0) and (Random(1) = 0) then
 for i:= Random(2) downto 0 do
 AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
 end
 AmmoShove(Gear, 30, 40);
 HHGear^.State := HHGear^.State and (not gstNoDamage)
 end;
 HHGear^.dY := HHGear^.dY + cGravity;
-if not (HHGear^.dY.isNegative) then
+if (not HHGear^.dY.isNegative) then
 begin
 HHGear^.State := HHGear^.State or gstMoving;
 DeleteGear(Gear);
 AfterAttack;
 exit
 procedure doStepAirAttackWork(Gear: PGear);
 begin
 AllInactive := false;
 Gear^.X := Gear^.X + cAirPlaneSpeed * Gear^.Tag;
-if (Gear^.Health > 0)and(not (Gear^.X < Gear^.dX))and(Gear^.X < Gear^.dX + cAirPlaneSpeed) then
+if (Gear^.Health > 0) and (not (Gear^.X < Gear^.dX)) and (Gear^.X < Gear^.dX + cAirPlaneSpeed) then
 begin
 dec(Gear^.Health);
 case Gear^.State of
 0: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtAirBomb, 0, cBombsSpeed * Gear^.Tag, _0, 0);
 1: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtMine,    0, cBombsSpeed * Gear^.Tag, _0, 0);
 ty := int2hwFloat(Gear^.Target.Y);
 x := HHGear^.X;
 y := HHGear^.Y;
 if (Distance(tx - x, ty - y) > _256)
-or (not TryPlaceOnLand(Gear^.Target.X - SpritesData[sprAmGirder].Width div 2, Gear^.Target.Y - SpritesData[sprAmGirder].Height div 2, sprAmGirder, Gear^.State, true, false)) then
+or (not (TryPlaceOnLand(Gear^.Target.X - SpritesData[sprAmGirder].Width div 2, Gear^.Target.Y - SpritesData[sprAmGirder].Height div 2, sprAmGirder, Gear^.State, true, false))) then
 begin
 PlaySound(sndDenied);
 HHGear^.Message := HHGear^.Message and (not gmAttack);
 HHGear^.State := HHGear^.State and (not gstAttacking);
 HHGear^.State := HHGear^.State or gstHHChooseTarget;
 HHGear: PGear;
 begin
 AllInactive := false;
 HHGear := Gear^.Hedgehog^.Gear;
-if not TryPlaceOnLand(Gear^.Target.X - SpritesData[sprHHTelepMask].Width div 2,
+if (not (TryPlaceOnLand(Gear^.Target.X - SpritesData[sprHHTelepMask].Width div 2,
 Gear^.Target.Y - SpritesData[sprHHTelepMask].Height div 2,
-sprHHTelepMask, 0, false, false) then
+sprHHTelepMask, 0, false, false))) then
 begin
 HHGear^.Message := HHGear^.Message and (not gmAttack);
 HHGear^.State := HHGear^.State and (not gstAttacking);
 HHGear^.State := HHGear^.State or gstHHChooseTarget;
 DeleteGear(Gear);
 //fixes drill not exploding when touching HH bug
 if (Gear^.Timer = 0) or ((t <> nil) and (t^.Count <> 0))
 or ( ((Gear^.State and gsttmpFlag) = 0) and (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and (not TestCollisionXWithGear(Gear, hwSign(Gear^.dX))))
 // CheckLandValue returns true if the type isn't matched
-or (not CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y), lfIndestructible)) then
+or (not (CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y), lfIndestructible))) then
 begin
 //out of time or exited ground
 StopSoundChan(Gear^.SoundChannel);
 if (Gear^.State and gsttmpFlag) <> 0 then
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound)
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
 DeleteGear(Gear);
 exit
 end
-else if (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and (not TestCollisionXWithGear(Gear, hwSign(Gear^.dX))) then
+else if (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and (not (TestCollisionXWithGear(Gear, hwSign(Gear^.dX)))) then
 begin
 StopSoundChan(Gear^.SoundChannel);
 Gear^.Tag := 1;
 Gear^.doStep := @doStepDrill
 end;
 HHGear^.State := HHGear^.State or gstMoving;
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y;
-if not isUnderWater and hasBorder and ((HHGear^.X < _0)
+if (not isUnderWater) and hasBorder and ((HHGear^.X < _0)
 or (hwRound(HHGear^.X) > LAND_WIDTH)) then
 HHGear^.dY.isNegative:= false;
 if ((Gear^.State and gsttmpFlag) = 0)
 or (HHGear^.dY < _0) then
 iscake:= (iterator^.Kind = gtCake);
 // won't port stuff that does not move towards the front/portal entrance
 if iscake then
 begin
-if not (((iterator^.X - Gear^.X)*ox + (iterator^.Y - Gear^.Y)*oy).isNegative) then
+if (not (((iterator^.X - Gear^.X)*ox + (iterator^.Y - Gear^.Y)*oy).isNegative)) then
 continue;
 end
 else
-if not ((Gear^.dX*ox + Gear^.dY*oy).isNegative) then
+if (not ((Gear^.dX*ox + Gear^.dY*oy).isNegative)) then
 continue;
 isbullet:= (iterator^.Kind in [gtShotgunShot, gtDEagleShot, gtSniperRifleShot, gtSineGunShot]);
 r:= int2hwFloat(iterator^.Radius);
-if not (isbullet or iscake) then
+if (not (isbullet or iscake)) then
 begin
 // wow! good candidate there, let's see if the distance and direction is okay!
 if hasdxy then
 begin
 s := r / Distance(iterator^.dX, iterator^.dY);
 // calc gear offset in portal vector direction
 ox := (iterator^.X - Gear^.X);
 oy := (iterator^.Y - Gear^.Y);
 poffs:= (Gear^.dX * ox + Gear^.dY * oy);
-if not isBullet and poffs.isNegative then
+if (not isBullet) and poffs.isNegative then
 continue;
 // only port bullets close to the portal
 if isBullet and (not (hwAbs(poffs) < _3)) then
 continue;
 ny := Gear^.dX;
 // ... decide where the top is based on the hog's direction when firing the portal
 if Gear^.Elasticity.isNegative then
 nx.isNegative := (not nx.isNegative)
 else
-ny.isNegative := not ny.isNegative;
+ny.isNegative := (not ny.isNegative);
 // calc gear offset in portal normal vector direction
 noffs:= (nx * ox + ny * oy);
 if isBullet and (noffs.Round >= Longword(Gear^.Radius)) then
 continue;
 // avoid gravity related loops of not really moving gear
-if not (iscake or isbullet)
+if (not (iscake or isbullet))
 and (Gear^.dY.isNegative)
 and (conPortal^.dY.isNegative)
 and ((iterator^.dX.QWordValue + iterator^.dY.QWordValue) < _0_08.QWordValue)
 and (iterator^.PortalCounter > 0) then
 continue;
 nx := conPortal^.dY;
 ny := conPortal^.dX;
 if conPortal^.Elasticity.isNegative then
 nx.isNegative := (not nx.isNegative)
 else
-ny.isNegative := not ny.isNegative;
+ny.isNegative := (not ny.isNegative);
 // inverse cake's normal movement direction,
 // as if it just walked through a hole
 //if iscake then nspeed.isNegative:= not nspeed.isNegative;
 end;
 iterator^.X := conPortal^.X + poffs * conPortal^.dX + noffs * nx;
 iterator^.Y := conPortal^.Y + poffs * conPortal^.dY + noffs * ny;
-if not hasdxy and (not (conPortal^.dY.isNegative)) then
+if (not hasdxy) and (not (conPortal^.dY.isNegative)) then
 begin
 iterator^.dY:= iterator^.dY + hwAbs(cGravity * (iterator^.Y - conPortal^.Y))
 end;
 // see if the space on the exit side actually is enough
-if not (isBullet or isCake) then
+if (not (isBullet or isCake)) then
 begin
 // TestCollisionXwithXYShift requires a hwFloat for xShift
 ox.QWordValue := _1.QWordValue;
 ox.isNegative := not iterator^.dX.isNegative;
 // check front
 isCollision := TestCollisionY(iterator, sy)
 or TestCollisionX(iterator, sx);
-if not isCollision then
+if (not isCollision) then
 begin
 // check center area (with half the radius so that the
 // the square check won't check more pixels than we want to)
 iterator^.Radius := 1 + resetr div 2;
 rh := resetr div 4;
 resetdx.QWordValue:= 4294967296 * 1152;
 resetdy:=hwAbs(iterator^.dX*4);
 resetdy:= resetdy + hwPow(resetdy,3)/_6 + _3 * hwPow(resetdy,5) / _40 + _5 * hwPow(resetdy,7) / resety + resetx * hwPow(resetdy,9) / resetdx;
 iterator^.Angle:= hwRound(resetdy*_2048 / _PI);
-if not iterator^.dY.isNegative then iterator^.Angle:= 2048-iterator^.Angle;
+if (not iterator^.dY.isNegative) then iterator^.Angle:= 2048-iterator^.Angle;
 if iterator^.dX.isNegative then iterator^.Angle:= 4096-iterator^.Angle;
 end
 // VISUAL USE OF ANGLE ONLY
 else if (CurAmmoGear <> nil) and (CurAmmoGear^.Kind = gtKamikaze) and (CurAmmoGear^.Hedgehog = iterator^.Hedgehog) then
 begin
 and (iterator = CurrentHedgehog^.Gear)
 and (CurAmmoGear <> nil)
 and (CurAmmoGear^.Kind =gtRope) then
 CurAmmoGear^.PortalCounter:= 1;
-if not isbullet and (iterator^.State and gstInvisible = 0)
+if (not isbullet) and (iterator^.State and gstInvisible = 0)
 and (iterator^.Kind <> gtFlake) then
 FollowGear := iterator;
 // store X/Y values of exit for net bullet trail
 if isbullet then
 begin
 Gear^.State := Gear^.State or gstCollision;
 Gear^.State := Gear^.State and (not gstMoving);
 if (Land[y, x] and lfBouncy <> 0)
-or (not CalcSlopeTangent(Gear, x, y, tx, ty, 255))
+or (not (CalcSlopeTangent(Gear, x, y, tx, ty, 255)))
 or (DistanceI(tx,ty) < _12) then // reject shots at too irregular terrain
 begin
 loadNewPortalBall(Gear, true);
 EXIT;
 end;
 s := _1/DistanceI(tx,ty);
 Gear^.dX :=  s * ty;
 Gear^.dY := -s * tx;
 Gear^.DirAngle := DxDy2Angle(-Gear^.dY,Gear^.dX);
-if not Gear^.dX.isNegative then
+if (not Gear^.dX.isNegative) then
 Gear^.DirAngle := 180-Gear^.DirAngle;
 if ((Gear^.LinkedGear = nil)
 or (hwRound(Distance(Gear^.X - Gear^.LinkedGear^.X,Gear^.Y-Gear^.LinkedGear^.Y)) >=Gear^.Radius*2)) then
 begin
 begin
 // This jiggles gears, to ensure a portal connection just placed under a gear takes effect.
 iterator:= GearsList;
 while iterator <> nil do
 begin
-if not (iterator^.Kind in [gtPortal, gtAirAttack, gtKnife]) and ((iterator^.Hedgehog <> CurrentHedgehog)
+if (not (iterator^.Kind in [gtPortal, gtAirAttack, gtKnife])) and ((iterator^.Hedgehog <> CurrentHedgehog)
 or ((iterator^.Message and gmAllStoppable) = 0)) then
 begin
 iterator^.Active:= true;
 if iterator^.dY.QWordValue = 0 then
 iterator^.dY.isNegative:= false;
 gi := GearsList;
 while gi <> nil do
 begin
 with gi^ do CheckSum:= CheckSum xor X.round xor X.frac xor dX.round xor dX.frac xor Y.round xor Y.frac xor dY.round xor dY.frac;
 AddRandomness(CheckSum);
-if gi^.Kind = gtGenericFaller then gi^.State:= gi^.State and not gstTmpFlag;
+if gi^.Kind = gtGenericFaller then gi^.State:= gi^.State and (not gstTmpFlag);
 gi := gi^.NextGear
 end;
 AddPickup(Gear^.Hedgehog^, a, Gear^.Power, hwRound(Gear^.X), hwRound(Gear^.Y));
 DeleteGear(Gear)
 end;
 end
 else if (GameTicks and $FF = 0) then
 begin
 tdX:= HHGear^.X-Gear^.X;
 dir:= hwSign(tdX);
-if not TestCollisionX(Gear, dir) then
+if (not TestCollisionX(Gear, dir)) then
 Gear^.X:= Gear^.X + signAs(_1,tdX);
 if TestCollisionXwithXYShift(Gear, signAs(_10,tdX), 0, dir) then
 begin
 Gear^.dX:= SignAs(_0_15, tdX);
 Gear^.dY:= -_0_3;
 AddGearCI(Gear)
 end
 else if GameTicks and $3F = 0 then
 begin
 if  (TestCollisionYwithGear(Gear, -1) = 0)
-and (not TestCollisionXwithGear(Gear, 1))
+and (not (TestCollisionXwithGear(Gear, 1)))
-and (not TestCollisionXwithGear(Gear, -1))
+and (not (TestCollisionXwithGear(Gear, -1)))
 and (TestCollisionYwithGear(Gear, 1) = 0) then Gear^.State:= Gear^.State and (not gstCollision) or gstMoving;
 end
 end;
 (*
 This didn't end up getting used, but, who knows, might be reasonable for javellin or something

branch	webgl
changeset 8105	d088be5ecdcb
parent 8096	453917e94e55
child 8330	aaefa587e277