sheepy-clone: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:ce02ddfe8aa1
+:537bbd5c1a62
 CheckGearDrowning := false;
 end;
 procedure CheckCollision(Gear: PGear); inline;
 begin
-if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) or TestCollisionYwithGear(Gear, hwSign(Gear^.dY)
+if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) or (TestCollisionYwithGear(Gear, hwSign(Gear^.dY)) <> 0)
-)
 then Gear^.State := Gear^.State or      gstCollision
 else Gear^.State := Gear^.State and not gstCollision
 end;
 procedure CheckCollisionWithLand(Gear: PGear); inline;
 var
 isFalling: boolean;
 //tmp: QWord;
 tdX, tdY: hwFloat;
 collV, collH: LongInt;
+land: word;
 begin
 // clip velocity at 1.9 - over 1 per pixel, but really shouldn't cause many actual problems.
 if Gear^.dX.QWordValue > 8160437862 then Gear^.dX.QWordValue:= 8160437862;
 if Gear^.dY.QWordValue > 8160437862 then Gear^.dY.QWordValue:= 8160437862;
 Gear^.State := Gear^.State and not gstCollision;
 if (hwRound(Gear^.X) < LAND_WIDTH div -2) or (hwRound(Gear^.X) > LAND_WIDTH * 3 div 2) then Gear^.State := Gear^.State or gstCollision;
 if Gear^.dY.isNegative then
 begin
 isFalling := true;
-if TestCollisionYwithGear(Gear, -1) then
+land:= TestCollisionYwithGear(Gear, -1);
+if land <> 0 then
 begin
 collV := -1;
-Gear^.dX :=   Gear^.dX * Gear^.Friction;
+if land and lfIce <> 0 then Gear^.dX := Gear^.dX * (_1 - (_1 - Gear^.Friction) / _10)
+else Gear^.dX := Gear^.dX * Gear^.Friction;
 Gear^.dY := - Gear^.dY * Gear^.Elasticity;
 Gear^.State := Gear^.State or gstCollision
 end
-else if (Gear^.AdvBounce=1) and TestCollisionYwithGear(Gear, 1) then collV := 1;
+else if (Gear^.AdvBounce=1) and (TestCollisionYwithGear(Gear, 1) <> 0) then collV := 1;
 end
-else if TestCollisionYwithGear(Gear, 1) then
+else
 begin
-collV := 1;
+land:= TestCollisionYwithGear(Gear, 1);
-isFalling := false;
+if land <> 0 then
-Gear^.dX :=   Gear^.dX * Gear^.Friction;
+begin
-Gear^.dY := - Gear^.dY * Gear^.Elasticity;
+collV := 1;
-Gear^.State := Gear^.State or gstCollision
+isFalling := false;
-end
+if land and lfIce <> 0 then Gear^.dX := Gear^.dX * (_1 - (_1 - Gear^.Friction) / _10)
-else
+else Gear^.dX := Gear^.dX * Gear^.Friction;
-begin
-isFalling := true;
+Gear^.dY := - Gear^.dY * Gear^.Elasticity;
-if (Gear^.AdvBounce=1) and not Gear^.dY.isNegative and TestCollisionYwithGear(Gear, -1) then
+Gear^.State := Gear^.State or gstCollision
-collV := -1;
+end
+else
+begin
+isFalling := true;
+if (Gear^.AdvBounce=1) and not Gear^.dY.isNegative and (TestCollisionYwithGear(Gear, -1) <> 0) then
+collV := -1
+end
 end;
 if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
 begin
 Gear^.X := Gear^.X + Gear^.dX;
 Gear^.Y := Gear^.Y + _1_9;
 end;
 SetAllHHToActive;
 end;
-if TestCollisionYwithGear(Gear, 1) then
+if TestCollisionYwithGear(Gear, 1) <> 0 then
 begin
 Gear^.dY := _0;
 SetLittle(HHGear^.dX);
 HHGear^.dY := _0;
 end
 HHGear: PGear;
 begin
 HHGear := Gear^.Hedgehog^.Gear;
 if ((HHGear^.State and gstHHDriven) = 0)
 or (CheckGearDrowning(HHGear))
-or TestCollisionYwithGear(HHGear, 1) then
+or (TestCollisionYwithGear(HHGear, 1) <> 0) then
 begin
 DeleteGear(Gear);
 isCursorVisible := false;
 ApplyAmmoChanges(HHGear^.Hedgehog^);
 exit
 HedgehogChAngle(HHGear);
 if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then SetLittle(HHGear^.dX);
-if HHGear^.dY.isNegative and TestCollisionYwithGear(HHGear, -1) then HHGear^.dY := _0;
+if HHGear^.dY.isNegative and (TestCollisionYwithGear(HHGear, -1) <> 0) then HHGear^.dY := _0;
 HHGear^.X := HHGear^.X + HHGear^.dX;
 HHGear^.Y := HHGear^.Y + HHGear^.dY;
 HHGear^.dY := HHGear^.dY + cGravity;
 if (GameFlags and gfMoreWind) <> 0 then HHGear^.dX := HHGear^.dX + cWindSpeed / HHGear^.Density;
 // vector between hedgehog and rope attaching point
 ropeDx := HHGear^.X - Gear^.X;
 ropeDy := HHGear^.Y - Gear^.Y;
-if not TestCollisionYwithGear(HHGear, 1) then
+if TestCollisionYwithGear(HHGear, 1) = 0 then
 begin
 // depending on the rope vector we know which X-side to check for collision
 // in order to find out if the hog can still be moved by gravity
 if ropeDx.isNegative = RopeDy.IsNegative then
 tx := HHGear^.X;
 ty := HHGear^.Y;
 if ((Gear^.Message and gmDown) <> 0) and (Gear^.Elasticity < Gear^.Friction) then
 if not (TestCollisionXwithGear(HHGear, hwSign(ropeDx))
-or TestCollisionYwithGear(HHGear, hwSign(ropeDy))) then
+or (TestCollisionYwithGear(HHGear, hwSign(ropeDy)) <> 0)) then
 Gear^.Elasticity := Gear^.Elasticity + _0_3;
 if ((Gear^.Message and gmUp) <> 0) and (Gear^.Elasticity > _30) then
 if not (TestCollisionXwithGear(HHGear, -hwSign(ropeDx))
-or TestCollisionYwithGear(HHGear, -hwSign(ropeDy))) then
+or (TestCollisionYwithGear(HHGear, -hwSign(ropeDy)) <> 0)) then
 Gear^.Elasticity := Gear^.Elasticity - _0_3;
 HHGear^.X := Gear^.X + mdX * Gear^.Elasticity;
 HHGear^.Y := Gear^.Y + mdY * Gear^.Elasticity;
 if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then
 begin
 HHGear^.dX := -_0_6 * HHGear^.dX;
 haveCollision := true
 end;
-if TestCollisionYwithGear(HHGear, hwSign(HHGear^.dY)) then
+if TestCollisionYwithGear(HHGear, hwSign(HHGear^.dY)) <> 0 then
 begin
 HHGear^.dY := -_0_6 * HHGear^.dY;
 haveCollision := true
 end;
 DeleteCI(HHGear);
 if (HHGear^.State and gstMoving) <> 0 then
 begin
 if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then SetLittle(HHGear^.dX);
-if HHGear^.dY.isNegative and TestCollisionYwithGear(HHGear, -1) then HHGear^.dY := _0;
+if HHGear^.dY.isNegative and (TestCollisionYwithGear(HHGear, -1) <> 0) then HHGear^.dY := _0;
 HHGear^.X := HHGear^.X + HHGear^.dX;
 Gear^.X := Gear^.X + HHGear^.dX;
-if TestCollisionYwithGear(HHGear, 1) then
+if TestCollisionYwithGear(HHGear, 1) <> 0 then
 begin
 CheckHHDamage(HHGear);
 HHGear^.dY := _0
 //HHGear^.State:= HHGear^.State and not (gstHHJumping or gstHHHJump);
 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) 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
 inc(Gear^.Damage, hwRound(Gear^.dX * _70))
-else if Gear^.dY.isNegative and (Gear^.dY < -_0_2) and TestCollisionYwithGear(Gear, -1) then
+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^.Damage > random(30)) and ((GameTicks and $FF) = 0) then
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepSMine(Gear: PGear);
 begin
 // TODO: do real calculation?
-if TestCollisionXwithGear(Gear, 2) or TestCollisionYwithGear(Gear, -2) or TestCollisionXwithGear(Gear, -2) or TestCollisionYwithGear(Gear, 2) then
+if TestCollisionXwithGear(Gear, 2) or (TestCollisionYwithGear(Gear, -2) <> 0) or TestCollisionXwithGear(Gear, -2) or (TestCollisionYwithGear(Gear, 2) <> 0) then
 begin
 if (hwAbs(Gear^.dX) > _0) or (hwAbs(Gear^.dY) > _0) then
 begin
 PlaySound(sndRopeAttach);
 Gear^.dX:= _0;
 procedure doStepRollingBarrel(Gear: PGear);
 var
 i: LongInt;
 particle: PVisualGear;
 begin
-if (Gear^.dY.QWordValue = 0) and (Gear^.dY.QWordValue = 0) and not TestCollisionYwithGear(Gear, 1) then SetLittle(Gear^.dY);
+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^.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) 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
 end
 end
 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)
+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));
 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) then Gear
+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
 if (cBarrelHealth div Gear^.Health) > 2 then
 end
 end;
 exit
 end;
-if (Gear^.dY.QWordValue <> 0) or (not TestCollisionYwithGear(Gear, 1)) then
+if (Gear^.dY.QWordValue <> 0) or (TestCollisionYwithGear(Gear, 1) = 0) then
 begin
 AllInactive := false;
 Gear^.dY := Gear^.dY + cGravity;
 Gear^.Y := Gear^.Y + Gear^.dY;
 if (not Gear^.dY.isNegative) and (Gear^.dY > _0_001) then SetAllHHToActive;
-if (Gear^.dY.isNegative) and TestCollisionYwithGear(Gear, -1) then Gear^.dY := _0;
+if (Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, -1) <> 0) then Gear^.dY := _0;
-if (not Gear^.dY.isNegative) and TestCollisionYwithGear(Gear, 1) then
+if (not Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, 1) <> 0) then
 begin
 if (Gear^.dY > _0_2) and (k = gtExplosives) then
 inc(Gear^.Damage, hwRound(Gear^.dY * _70));
 if Gear^.dY > _0_2 then
 tdX,tdY: HWFloat;
 begin
 sticky:= (Gear^.State and gsttmpFlag) <> 0;
 if not sticky then AllInactive := false;
-if not TestCollisionYwithGear(Gear, 1) then
+if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 AllInactive := false;
 if ((GameTicks mod 100) = 0) then
 begin
 begin
 HHGear := Gear^.Hedgehog^.Gear;
 inc(Gear^.Timer);
-if TestCollisionYwithGear(HHGear, 1)
+if (TestCollisionYwithGear(HHGear, 1) <> 0)
 or ((HHGear^.State and gstHHDriven) = 0)
 or CheckGearDrowning(HHGear)
 or ((Gear^.Message and gmAttack) <> 0) then
 begin
 with HHGear^ do
 HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.Y := HHGear^.Y + HHGear^.dY;
 HHGear^.X := HHGear^.X + HHGear^.dX;
 // hedgehog falling to collect cases
 HHGear^.dY := HHGear^.dY + cGravity;
-if TestCollisionYwithGear(HHGear, 1)
+if (TestCollisionYwithGear(HHGear, 1) <> 0)
 or CheckGearDrowning(HHGear) then
 begin
 DeleteGear(Gear);
 AfterAttack
 end
 yy := dirs[Gear^.Angle].y;
 xxn := dirs[(LongInt(Gear^.Angle) + 4 + dA) mod 4].x;
 yyn := dirs[(LongInt(Gear^.Angle) + 4 + dA) mod 4].y;
 if (xx = 0) then
-if TestCollisionYwithGear(Gear, yy) then
+if TestCollisionYwithGear(Gear, yy) <> 0 then
 PrevAngle
 else
 begin
 Gear^.Tag := 0;
 Gear^.Y := Gear^.Y + int2hwFloat(yy);
 procedure doStepCakeFall(Gear: PGear);
 begin
 AllInactive := false;
 Gear^.dY := Gear^.dY + cGravity;
-if TestCollisionYwithGear(Gear, 1) then
+if TestCollisionYwithGear(Gear, 1) <> 0 then Gear^.doStep := @doStepCakeUp
-Gear^.doStep := @doStepCakeUp
 else
 begin
 Gear^.Y := Gear^.Y + Gear^.dY;
 if CheckGearDrowning(Gear) then AfterAttack
 end
 end;
 procedure doStepCake(Gear: PGear);
 var
 HHGear: PGear;
 end
 end;
 t := CheckGearsCollision(Gear);
 //fixes drill not exploding when touching HH bug
-if (Gear^.Timer = 0)
+if (Gear^.Timer = 0) or (t^.Count <> 0) or
-or (t^.Count <> 0)
+( ((Gear^.State and gsttmpFlag) = 0) and
-or (not TestCollisionYWithGear(Gear, hwSign(Gear^.dY))
+(TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0)
-and not TestCollisionXWithGear(Gear, hwSign(Gear^.dX))
+and not TestCollisionXWithGear(Gear, hwSign(Gear^.dX)))
-and ((Gear^.State and gsttmpFlag) = 0))
 // CheckLandValue returns true if the type isn't matched
 or not CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y), lfIndestructible) then
 begin
 //out of time or exited ground
 StopSound(Gear^.SoundChannel);
 else
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
 DeleteGear(Gear);
 exit
 end
-else if not TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) 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
 StopSound(Gear^.SoundChannel);
 Gear^.Tag := 1;
 Gear^.doStep := @doStepDrill
 end;
 (HHGear^.Damage <> 0)
 //or CheckGearDrowning(HHGear)
 or (cWaterLine + 512 < hwRound(HHGear^.Y))
 or (TurnTimeLeft = 0)
 // allow brief ground touches - to be fair on this, might need another counter
-or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and TestCollisionYwithGear(
+or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and (TestCollisionYwithGear(HHGear, 1) <> 0))
-HHGear, 1))
 or ((Gear^.Message and gmAttack) <> 0) then
 begin
 with HHGear^ do
 begin
 Message := 0;
 if  (Gear^.Health = 0)
 or (HHGear^.Damage <> 0)
 or CheckGearDrowning(HHGear)
 or (TurnTimeLeft = 0)
 // allow brief ground touches - to be fair on this, might need another counter
-or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and TestCollisionYwithGear(
+or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and (TestCollisionYwithGear(HHGear, 1) <> 0))
-HHGear, 1))
 or ((Gear^.Message and gmAttack) <> 0) then
 begin
 with HHGear^ do
 begin
 Message := 0;
 begin
 Gear^.X := Gear^.X + Gear^.dX;
 Gear^.Y := Gear^.Y + _1_9;
 end;
 end;
-if TestCollisionYwithGear(Gear, 1) then
+if TestCollisionYwithGear(Gear, 1) <> 0 then
 begin
 Gear^.dY := _0;
 SetLittle(HitGear^.dX);
 HitGear^.dY := _0;
 end
 else if (GameTicks and $1FF) <> 0 then exit;
 if Gear^.Power < 45 then
 begin
 inc(Gear^.Power);
-if not TestCollisionYwithGear(hh^.Gear, -1) then hh^.Gear^.Y := hh^.Gear^.Y - _1;
+if TestCollisionYwithGear(hh^.Gear, -1) = 0 then hh^.Gear^.Y := hh^.Gear^.Y - _1;
 end;
 graves := GearsNear(Gear^.X, Gear^.Y, gtGrave, Gear^.Radius);
 if Length(graves) = 0 then

changeset 6081	537bbd5c1a62
parent 6011	519f8a58c021
child 6092	fd602b5838ab