sheepy-clone: comparison hedgewars/HHHandlers.inc

equal deleted inserted replaced

-:88e49851d814
+:14224c9b4594
 ChangeAmmo:= false;
 slot:= HHGear^.MsgParam;
 with HHGear^.Hedgehog^ do
 begin
-HHGear^.Message:= HHGear^.Message and not gmSlot;
+HHGear^.Message:= HHGear^.Message and (not gmSlot);
 ammoidx:= 0;
 if ((HHGear^.State and (gstAttacking or gstAttacked)) <> 0) or
 ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0)) or
 ((HHGear^.State and gstHHDriven) = 0) then exit;
 ChangeAmmo:= true;
 while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do inc(ammoidx);
 if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) and (MultiShootAttacks > 0) then OnUsedAmmo(HHGear^.Hedgehog^);
 MultiShootAttacks:= 0;
-HHGear^.Message:= HHGear^.Message and not (gmLJump or gmHJump);
+HHGear^.Message:= HHGear^.Message and (not (gmLJump or gmHJump));
 if Ammoz[CurAmmoType].Slot = slot then
 begin
 i:= 0;
 repeat
 HHGear^.MsgParam:= Ammoz[weap].Slot;
 t:= cMaxSlotAmmoIndex;
-HHGear^.Message:= HHGear^.Message and not gmWeapon;
+HHGear^.Message:= HHGear^.Message and (not gmWeapon);
 with Hedgehog^ do
 while (CurAmmoType <> weap) and (t >= 0) do
 begin
 s:= ChangeAmmo(HHGear);
 procedure HHSetTimer(Gear: PGear);
 var CurWeapon: PAmmo;
 color: LongWord;
 begin
-Gear^.Message:= Gear^.Message and not gmTimer;
+Gear^.Message:= Gear^.Message and (not gmTimer);
 CurWeapon:= GetAmmoEntry(Gear^.Hedgehog^);
 with Gear^.Hedgehog^ do
 if ((Gear^.Message and gmPrecise) <> 0) and ((CurWeapon^.Propz and ammoprop_SetBounce) <> 0) then
 begin
 color:= Gear^.Hedgehog^.Team^.Clan^.Color;
 ((CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0)) or
 ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackInMove) <> 0)) and
 ((TargetPoint.X <> NoPointX) or ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) = 0)) then
 begin
 State:= State or gstAttacking;
-if Power = cMaxPower then Message:= Message and not gmAttack
+if Power = cMaxPower then Message:= Message and (not gmAttack)
-else if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_Power) = 0 then Message:= Message and not gmAttack
+else if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_Power) = 0 then Message:= Message and (not gmAttack)
 else begin
 if Power = 0 then
 begin
 AttackBar:= CurrentTeam^.AttackBar;
 PlaySound(sndThrowPowerUp)
 end else begin
 if not CurrentTeam^.ExtDriven and
 ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_Power) <> 0) then SendIPC('a');
 AfterAttack;
 end
-end else Message:= Message and not gmAttack;
+end else Message:= Message and (not gmAttack);
 end;
 TargetPoint.X := NoPointX;
 ScriptCall('onHogAttack');
 end;
 procedure AfterAttack;
 var s: shortstring;
 a: TAmmoType;
 begin
 with CurrentHedgehog^.Gear^,
 CurrentHedgehog^ do
 begin
 a:= CurAmmoType;
-State:= State and not gstAttacking;
+State:= State and (not gstAttacking);
 if (Ammoz[a].Ammo.Propz and ammoprop_Effect) = 0 then
 begin
 Inc(MultiShootAttacks);
 if (Ammoz[a].Ammo.NumPerTurn >= MultiShootAttacks) then
 Gear^.Pos:= 0
 end;
 if ((Gear^.Message and gmLJump ) <> 0) then
 begin
-Gear^.Message:= Gear^.Message and not gmLJump;
+Gear^.Message:= Gear^.Message and (not gmLJump);
 DeleteCI(Gear);
 if TestCollisionYwithGear(Gear, -1) = 0 then
 if not TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - _2 else
 if not TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - _1;
 if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX))
 end;
 if ((Gear^.Message and gmHJump ) <> 0) then
 begin
 DeleteCI(Gear);
-Gear^.Message:= Gear^.Message and not gmHJump;
+Gear^.Message:= Gear^.Message and (not gmHJump);
 Gear^.dY:= -_0_2;
 SetLittle(Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
 PlaySound(sndJump3, Gear^.Hedgehog^.Team^.voicepack);
 if Gear^.Hedgehog^.Unplaced then
 begin
 Gear^.dY:= _0;
 Gear^.dX:= _0;
-Gear^.State:= Gear^.State and not gstMoving;
+Gear^.State:= Gear^.State and (not gstMoving);
 exit
 end;
 isFalling:= (Gear^.dY.isNegative) or not TestCollisionYKick(Gear, 1);
 if isFalling then
 begin
 CheckHHDamage(Gear);
 if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery) and
 (Gear^.dX.QWordValue < _0_02.QWordValue) then Gear^.dX.isNegative:= not Gear^.dX.isNegative; // landing after high jump
-Gear^.State:= Gear^.State and not (gstHHJumping or gstHHHJump);
+Gear^.State:= Gear^.State and (not (gstHHJumping or gstHHHJump));
 Gear^.dY:= _0;
 end else Gear^.dY:= Gear^.dY + cGravity;
 if ((Gear^.State and gstMoving) <> 0) then
 begin
 if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -3, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_9 ; Gear^.Y:= Gear^.Y - _3 end else
 if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -4, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_87; Gear^.Y:= Gear^.Y - _4 end else
 if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -5, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_84; Gear^.Y:= Gear^.Y - _5 end else
 if hwAbs(Gear^.dX) > _0_02 then Gear^.dX:= -Gear^.Elasticity * Gear^.dX
 else begin
-Gear^.State:= Gear^.State and not gstMoving;
+Gear^.State:= Gear^.State and (not gstMoving);
 while TestCollisionYWithGear(Gear,1) = 0 do Gear^.Y:= Gear^.Y+_1;
 SetLittle(Gear^.dX)
 end
 else begin
-Gear^.State:= Gear^.State and not gstMoving;
+Gear^.State:= Gear^.State and (not gstMoving);
 while TestCollisionYWithGear(Gear,1) = 0 do Gear^.Y:= Gear^.Y+_1;
 SetLittle(Gear^.dX)
 end
 else if (hwAbs(Gear^.dX) > cLittle)
 and ((Gear^.State and gstHHJumping) = 0)
 else SetLittle(Gear^.dX);
 if (not isFalling) and
 (hwAbs(Gear^.dX) + hwAbs(Gear^.dY) < _0_03) then
 begin
-Gear^.State:= Gear^.State and not gstWinner;
+Gear^.State:= Gear^.State and (not gstWinner);
-Gear^.State:= Gear^.State and not gstMoving;
+Gear^.State:= Gear^.State and (not gstMoving);
 while TestCollisionYWithGear(Gear,1) = 0 do Gear^.Y:= Gear^.Y+_1;
 SetLittle(Gear^.dX);
 Gear^.dY:= _0
 end else Gear^.State:= Gear^.State or gstMoving;
 if (Gear^.State and gstMoving) <> 0 then
 begin
-Gear^.State:= Gear^.State and not gstAnimation;
+Gear^.State:= Gear^.State and (not gstAnimation);
 // ARTILLERY but not being moved by explosions
 Gear^.X:= Gear^.X + Gear^.dX;
 Gear^.Y:= Gear^.Y + Gear^.dY;
 if (not Gear^.dY.isNegative) and
 (not TestCollisionYKick(Gear, 1)) and
 if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) then
 begin
 if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
 TurnTimeLeft:= 0;
 isCursorVisible:= false;
-HHGear^.State:= HHGear^.State and not (gstHHDriven or gstAnimation or gstAttacking);
+HHGear^.State:= HHGear^.State and (not (gstHHDriven or gstAnimation or gstAttacking));
 AttackBar:= 0;
 if HHGear^.Damage > 0 then
-HHGear^.State:= HHGear^.State and not (gstHHJumping or gstHHHJump);
+HHGear^.State:= HHGear^.State and (not (gstHHJumping or gstHHHJump));
 exit
 end;
 if (HHGear^.State and gstAnimation) <> 0 then
 begin
 if HHGear^.Timer = Wavez[TWave(HHGear^.Tag)].Interval then
 begin
 HHGear^.Timer:= 0;
 inc(HHGear^.Pos);
 if HHGear^.Pos = Wavez[TWave(HHGear^.Tag)].FramesCount then
-HHGear^.State:= HHGear^.State and not gstAnimation
+HHGear^.State:= HHGear^.State and (not gstAnimation)
 end;
 exit
 end;
 if ((HHGear^.State and gstMoving) <> 0)
 if ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0)
 and ((HHGear^.Message and gmLJump) <> 0)
 and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) then
 begin
 Attack(HHGear);
-HHGear^.Message:= HHGear^.Message and not gmLJump
+HHGear^.Message:= HHGear^.Message and (not gmLJump)
 end;
 if (CurAmmoGear = nil)
 or ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0)
 or ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) then
 HHGear^.dY:= -_0_25;
 if not cArtillery then HHGear^.dX:= -SignAs(_0_02, HHGear^.dX);
 PlaySound(sndJump2, Hedgehog^.Team^.voicepack)
 end;
-HHGear^.Message:= HHGear^.Message and not (gmLJump or gmHJump);
+HHGear^.Message:= HHGear^.Message and (not (gmLJump or gmHJump));
 if (not cArtillery) and wasJumping and
 TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then SetLittle(HHGear^.dX);
 if Hedgehog^.Gear <> nil then doStepHedgehogMoving(HHGear);
 Gear^.Hedgehog^.Effects[hePoisoned] := false;
 if Gear^.Hedgehog^.Effects[heResurrectable] then begin
 ResurrectHedgehog(Gear);
 end else
 begin
-Gear^.State:= (Gear^.State or gstHHDeath) and not gstAnimation;
+Gear^.State:= (Gear^.State or gstHHDeath) and (not gstAnimation);
 Gear^.doStep:= @doStepHedgehogDead;
 // Death message
 AddCaption(Format(GetEventString(eidDied), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage);
 end;
 end
 else
 begin
-Gear^.State:= Gear^.State and not gstAnimation;
+Gear^.State:= Gear^.State and (not gstAnimation);
 Gear^.doStep:= @doStepHedgehogGone;
 // Gone message
 AddCaption(Format(GetEventString(eidGone), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage);
 end
 Gear^.Timer:= 150
 end else
 begin
 if Gear^.Timer = 0 then
 begin
-Gear^.State:= Gear^.State and not (gstWait or gstLoser or gstWinner or gstAttacked or gstNotKickable or gstHHChooseTarget);
+Gear^.State:= Gear^.State and (not (gstWait or gstLoser or gstWinner or gstAttacked or gstNotKickable or gstHHChooseTarget));
 Gear^.Active:= false;
 AddGearCI(Gear);
 exit
 end else dec(Gear^.Timer)
 end;

changeset 6450	14224c9b4594
parent 6402	4670f003f91b
child 6453	11c578d30bd3