sheepy-clone: comparison hedgewars/uGearsHandlersMess.pas

equal deleted inserted replaced

-:56d2f2d5aad8
+:4feced261c68
 * Important: Since gears change the course of the game, calculations that
 *            lead to different results for different clients/players/machines
 *            should NOT occur!
 *            Use safe functions and data types! (e.g. GetRandom() and hwFloat)
 *)
 {$INCLUDE "options.inc"}
 unit uGearsHandlersMess;
 interface
 uses uTypes, uFloat;
 begin
 xland:= TestCollisionXwithGear(Gear, -hwSign(Gear^.dX));
 if xland <> 0 then collH := -hwSign(Gear^.dX)
 end;
 //if Gear^.AdvBounce and (collV <>0) and (collH <> 0) and (hwSqr(tdX) + hwSqr(tdY) > _0_08) then
 if (collV <> 0) and (collH <> 0) and
 (((Gear^.AdvBounce=1) and ((collV=-1) or ((tdX.QWordValue + tdY.QWordValue) > _0_2.QWordValue)))) then
 //or ((xland or land) and lfBouncy <> 0)) then
 begin
 if (xland or land) and lfBouncy = 0 then
 begin
 else
 Gear^.State := Gear^.State or gstMoving;
 if ((xland or land) and lfBouncy <> 0) and (Gear^.dX.QWordValue < _0_15.QWordValue) and (Gear^.dY.QWordValue < _0_15.QWordValue) then
 Gear^.State := Gear^.State or gstCollision;
 if ((xland or land) and lfBouncy <> 0) and (Gear^.Radius >= 3) and
 ((Gear^.dX.QWordValue > _0_15.QWordValue) or (Gear^.dY.QWordValue > _0_15.QWordValue)) then
 begin
 boing:= AddVisualGear(gX, gY, vgtStraightShot, 0, false, 1);
 if boing <> nil then
 draw:= true;
 xx:= hwRound(Gear^.X);
 yy:= hwRound(Gear^.Y);
 if draw and (WorldEdge = weWrap) and ((xx < LongInt(leftX) + 3) or (xx > LongInt(rightX) - 3)) then
 begin
 if xx < LongInt(leftX) + 3 then
 xx:= rightX-3
 else xx:= leftX+3;
 Gear^.X:= int2hwFloat(xx)
 end
 end
 if Gear^.Timer = 0 then
 begin
 // no need to display remaining time anymore
 Gear^.RenderTimer:= false;
 // bee can drown when timer reached 0
-Gear^.State:= Gear^.State and not gstSubmersible;
+Gear^.State:= Gear^.State and (not gstSubmersible);
 end;
 end;
 end;
 procedure doStepBee(Gear: PGear);
 y := hwRound(Gear^.Y);
 if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y, x] <> 0) then
 inc(Gear^.Damage);
 // let's interrupt before a collision to give portals a chance to catch the bullet
-if (Gear^.Damage = 1) and (Gear^.Tag = 0) and not(CheckLandValue(x, y, lfLandMask)) then
+if (Gear^.Damage = 1) and (Gear^.Tag = 0) and (not CheckLandValue(x, y, lfLandMask)) then
 begin
 Gear^.Tag := 1;
 Gear^.Damage := 0;
 Gear^.X := Gear^.X - Gear^.dX;
 Gear^.Y := Gear^.Y - Gear^.dY;
 PlaySound(sndMineTick);
 dec(Gear^.Timer);
 end
 end
 else // gsttmpFlag = 0
 if ((GameFlags and gfInfAttack = 0) and ((TurnTimeLeft = 0) or (Gear^.Hedgehog^.Gear = nil)))
 or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) then
 Gear^.State := Gear^.State or gsttmpFlag;
 end;
 ////////////////////////////////////////////////////////////////////////////////
 dxdy: hwFloat;
 begin
 if (Gear^.dY.QWordValue = 0) and (Gear^.dY.QWordValue = 0) and (TestCollisionYwithGear(Gear, 1) = 0) then
 SetLittle(Gear^.dY);
 Gear^.State := Gear^.State or gstAnimation;
-if Gear^.Health < cBarrelHealth then Gear^.State:= Gear^.State and not gstFrozen;
+if Gear^.Health < cBarrelHealth then Gear^.State:= Gear^.State and (not gstFrozen);
 if ((Gear^.dX.QWordValue <> 0)
 or (Gear^.dY.QWordValue <> 0))  then
 begin
 DeleteCI(Gear);
 with CurrentHedgehog^ do
 if Gear <> nil then
 Gear^.Message := Gear^.Message and (not (gmLJump or gmHJump));
 exit
 end;
-if (k = gtExplosives) and (Gear^.Health < cBarrelHealth) then Gear^.State:= Gear^.State and not gstFrozen;
+if (k = gtExplosives) and (Gear^.Health < cBarrelHealth) then Gear^.State:= Gear^.State and (not gstFrozen);
 if ((k <> gtExplosives) and (Gear^.Damage > 0)) or ((k = gtExplosives) and (Gear^.Health<=0)) then
 begin
 x := hwRound(Gear^.X);
 y := hwRound(Gear^.Y);
 PlaySound(sndVaporize);
 DeleteGear(Gear);
 exit
 end
 end
 else
 begin
 if (Gear^.Timer = 1) and (GameTicks and $3 = 0) then
 begin
 Gear^.Y:= Gear^.Y+_6;
 if (landPixel and lfIce <> 0) or (TestCollisionYwithGear(Gear, 1) and lfIce <> 0) then
 doStepFallingGear(Gear);
 if (Gear^.State and gstCollision) <> 0 then
 begin
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound);
 DeleteGear(Gear);
+{$IFNDEF PAS2C}
 with mobileRecord do
 if (performRumble <> nil) and (not fastUntilLag) then
 performRumble(kSystemSoundID_Vibrate);
+{$ENDIF}
 exit
 end;
 if (GameTicks and $3F) = 0 then
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
 end;
 LandFlags:= 0;
 if Gear^.AmmoType = amRubber then LandFlags:= lfBouncy
 else if cIce then LandFlags:= lfIce;
 if ((Distance(tx - x, ty - y) > _256) and ((WorldEdge <> weWrap) or
 (
 (Distance(tx - int2hwFloat(rightX+(rx-leftX)), ty - y) > _256) and
 (Distance(tx - int2hwFloat(leftX-(rightX-rx)), ty - y) > _256)
 )))
 or (not TryPlaceOnLand(Gear^.Target.X - SpritesData[Ammoz[Gear^.AmmoType].PosSprite].Width div 2, Gear^.Target.Y - SpritesData[Ammoz[Gear^.AmmoType].PosSprite].Height div 2, Ammoz[Gear^.AmmoType].PosSprite, Gear^.State, true, false, LandFlags)) then
 AmmoShove(Gear, 0, 80);
 Gear^.dX.isNegative := not Gear^.dX.isNegative;
 Gear^.dY.isNegative := not Gear^.dY.isNegative;
 Gear^.doStep := @doStepSineGunShotWork;
+{$IFNDEF PAS2C}
 with mobileRecord do
 if (performRumble <> nil) and (not fastUntilLag) then
 performRumble(kSystemSoundID_Vibrate);
+{$ENDIF}
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepFlamethrowerWork(Gear: PGear);
 var
 begin
 StopSoundChan(Gear^.SoundChannel);
 Gear^.SoundChannel:= -1;
 if GameTicks mod 40 = 0 then dec(Gear^.Health)
 end
 else
 begin
 if Gear^.SoundChannel = -1 then
 Gear^.SoundChannel := LoopSound(sndIceBeam);
 if GameTicks mod 10 = 0 then dec(Gear^.Health)
 end
 landRect.x := min(max(target.x - iceRadius, 0), LAND_WIDTH - 1);
 landRect.y := min(max(target.y - iceRadius, 0), LAND_HEIGHT - 1);
 landRect.w := min(2*iceRadius, LAND_WIDTH - landRect.x - 1);
 landRect.h := min(2*iceRadius, LAND_HEIGHT - landRect.y - 1);
 UpdateLandTexture(landRect.x, landRect.w, landRect.y, landRect.h, true);
 // Freeze nearby mines/explosives/cases too
 iter := GearsList;
 while iter <> nil do
 begin
 if (iter^.State and gstFrozen = 0) and
 ((iter^.Kind = gtExplosives) or (iter^.Kind = gtCase) or (iter^.Kind = gtMine)) and
-(abs(iter^.X.Round-target.x)+abs(iter^.Y.Round-target.y)+2<2*iceRadius) and (Distance(iter^.X-int2hwFloat(target.x),iter^.Y-int2hwFloat(target.y))<int2hwFloat(iceRadius*2)) then
+(abs(LongInt(iter^.X.Round) - target.x) + abs(LongInt(iter^.Y.Round) - target.y) + 2 < 2 * iceRadius)
+and (Distance(iter^.X - int2hwFloat(target.x), iter^.Y - int2hwFloat(target.y)) < int2hwFloat(iceRadius * 2)) then
 begin
 for t:= 0 to 5 do
 begin
 vg:= AddVisualGear(hwRound(iter^.X)+random(4)-8, hwRound(iter^.Y)+random(8), vgtDust, 1);
 if vg <> nil then
 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;

changeset 10015	4feced261c68
parent 10011	ead5e4b21671
parent 9954	bf51bc7e2808
child 10040	4ac87acbaed9