hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:88e49851d814
+:14224c9b4594
 while gi <> nil do
 begin
 if (gi^.Kind = gtHedgehog) then
 begin
 d := r - hwRound(Distance(gi^.X - x, gi^.Y - y));
-if (d > 1) and not gi^.Invulnerable and (GetRandom(2) = 0) then
+if (d > 1) and (not gi^.Invulnerable) and (GetRandom(2) = 0) then
 begin
 if (CurrentHedgehog^.Gear = gi) then
 PlaySound(sndOops, gi^.Hedgehog^.Team^.voicepack)
 else
 begin
 RemoveGearFromList(HH^.Gear);
 with HH^.Gear^ do
 begin
 Z := cHHZ;
 Active := false;
-State:= State and not (gstHHDriven or gstAttacking or gstAttacked);
+State:= State and (not (gstHHDriven or gstAttacking or gstAttacked));
-Message := Message and not gmAttack;
+Message := Message and (not gmAttack);
 end;
 HH^.GearHidden:= HH^.Gear;
 HH^.Gear:= nil
 end;
 procedure RestoreHog(HH: PHedgehog);
 begin
 HH^.Gear:=HH^.GearHidden;
 HH^.GearHidden:= nil;
 InsertGearToList(HH^.Gear);
-HH^.Gear^.State:= (HH^.Gear^.State and not (gstHHDriven or gstInvisible or gstAttacking)) or gstAttacked;
+HH^.Gear^.State:= (HH^.Gear^.State and (not (gstHHDriven or gstInvisible or gstAttacking))) or gstAttacked;
 AddGearCI(HH^.Gear);
 HH^.Gear^.Active:= true;
 ScriptCall('onHogRestore', HH^.Gear^.Uid)
 end;
 procedure CheckCollision(Gear: PGear); inline;
 begin
 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
+else Gear^.State := Gear^.State and (not gstCollision)
 end;
 procedure CheckCollisionWithLand(Gear: PGear); inline;
 begin
 if TestCollisionX(Gear, hwSign(Gear^.dX)) or TestCollisionY(Gear, hwSign(Gear^.dY)
 )
 then Gear^.State := Gear^.State or      gstCollision
-else Gear^.State := Gear^.State and not gstCollision
+else Gear^.State := Gear^.State and (not gstCollision)
 end;
 procedure CheckHHDamage(Gear: PGear);
 var
 dmg: Longword;
 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;
+Gear^.State := Gear^.State and (not gstCollision);
 collV := 0;
 collH := 0;
 tdX := Gear^.dX;
 tdY := Gear^.dY;
 Gear^.State := Gear^.State or gstCollision
 end
 else
 begin
 isFalling := true;
-if (Gear^.AdvBounce=1) and not Gear^.dY.isNegative and (TestCollisionYwithGear(Gear, -1) <> 0) then
+if (Gear^.AdvBounce=1) and (not Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, -1) <> 0) then
 collV := -1
 end
 end;
 if Gear^.Kind <> gtBee then
 CheckGearDrowning(Gear);
 //if (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) < _0_0002) and
 if ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) < _0_02.QWordValue) and
 (not isFalling) then
-Gear^.State := Gear^.State and not gstMoving
+Gear^.State := Gear^.State and (not gstMoving)
 else
 Gear^.State := Gear^.State or      gstMoving;
 if (Gear^.nImpactSounds > 0) and
 (((Gear^.Kind <> gtMine) and (Gear^.Damage <> 0)) or
 gun:= (Gear^.State and gstTmpFlag) <> 0;
 move:= false;
 draw:= false;
 if gun then
 begin
-Gear^.State:= Gear^.State and not gstInvisible;
+Gear^.State:= Gear^.State and (not gstInvisible);
 doStepFallingGear(Gear);
 CheckCollision(Gear);
 if ((Gear^.State and gstCollision) <> 0) or ((Gear^.State and gstMoving) = 0) then draw:= true;
 xx:= hwRound(Gear^.X);
 yy:= hwRound(Gear^.Y);
 end
 else if GameTicks and $7 = 0 then
 begin
 with Gear^ do
 begin
-State:= State and not gstInvisible;
+State:= State and (not gstInvisible);
 X:= X + cWindSpeed * 3200 + dX;
 Y:= Y + dY + cGravity * vobFallSpeed * 8;  // using same value as flakes to try and get similar results
 xx:= hwRound(X);
 yy:= hwRound(Y);
 if vobVelocity <> 0 then
 if LandPixels[ry, rx] = 0 then Land[ly, lx]:=  lfDamaged or lfObject
 else Land[ly, lx]:=  lfDamaged or lfBasic
 end
 else Land[ly, lx]:= lf;
 if gun then
-LandPixels[ry, rx]:= (cExplosionBorderColor and not AMask) or (p^[px] and AMask)
+LandPixels[ry, rx]:= (cExplosionBorderColor and (not AMask)) or (p^[px] and AMask)
 else LandPixels[ry, rx]:= addBgColor(LandPixels[ry, rx], p^[px]);
 end
 else allpx:= false
 end;
 p:= @(p^[s^.pitch shr 2])
 exit
 end;
 dec(Gear^.Timer);
 if Gear^.Timer = 0 then
 begin
-Gear^.Hedgehog^.Gear^.Message:= Gear^.Hedgehog^.Gear^.Message and not gmAttack;
+Gear^.Hedgehog^.Gear^.Message:= Gear^.Hedgehog^.Gear^.Message and (not gmAttack);
-Gear^.Hedgehog^.Gear^.State:= Gear^.Hedgehog^.Gear^.State and not gstAttacking;
+Gear^.Hedgehog^.Gear^.State:= Gear^.Hedgehog^.Gear^.State and (not gstAttacking);
 AttackBar:= 0;
 Gear^.SoundChannel := LoopSound(sndBee);
 Gear^.Timer := 5000;
 // save initial speed in otherwise unused Friction variable
 y:= hwRound(Gear^.Y);
 if (Gear^.Timer mod 33) = 0 then
 begin
 HHGear^.State := HHGear^.State or gstNoDamage;
 doMakeExplosion(x, y + 7, 6, Gear^.Hedgehog, EXPLDontDraw);
-HHGear^.State := HHGear^.State and not gstNoDamage
+HHGear^.State := HHGear^.State and (not gstNoDamage)
 end;
 if (Gear^.Timer mod 47) = 0 then
 begin
 // ok. this was an attempt to turn off dust if not actually drilling land.  I have no idea why it isn't working as expected
 else
 HHGear^.Message := (HHGear^.Message and (gmAttack or gmUp or gmDown)) or gmRight;
 if ((HHGear^.State and gstMoving) = 0) then
 begin
-HHGear^.State := HHGear^.State and not gstAttacking;
+HHGear^.State := HHGear^.State and (not gstAttacking);
 prevX := hwRound(HHGear^.X);
 // why the call to HedgehogStep then a further increment of X?
 if (prevX = hwRound(HHGear^.X)) and
 CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y),
 Gear^.X := HHGear^.X + Gear^.dX * (cHHRadius + cBlowTorchC);
 Gear^.Y := HHGear^.Y + Gear^.dY * (cHHRadius + cBlowTorchC);
 end;
 HHGear^.State := HHGear^.State or gstNoDamage;
 AmmoShove(Gear, 2, 15);
-HHGear^.State := HHGear^.State and not gstNoDamage
+HHGear^.State := HHGear^.State and (not gstNoDamage)
 end;
 end;
 if b then
 begin
 Gear^.dX := SignAs(AngleSin(HHGear^.Angle), HHGear^.dX);
 Gear^.dY := -AngleCos(HHGear^.Angle);
 Gear^.Friction := _450 * _0_01 * cRopePercent;
 Gear^.Elasticity := _0;
-Gear^.State := Gear^.State and not gsttmpflag;
+Gear^.State := Gear^.State and (not gsttmpflag);
 Gear^.doStep := @doStepRope;
 end
 end;
 procedure doStepRopeWork(Gear: PGear);
 procedure DeleteMe;
 begin
 with HHGear^ do
 begin
-Message := Message and not gmAttack;
+Message := Message and (not gmAttack);
-State := (State or gstMoving) and not gstWinner;
+State := (State or gstMoving) and (not gstWinner);
 end;
 DeleteGear(Gear)
 end;
 procedure WaitCollision;
 begin
 with HHGear^ do
 begin
-Message := Message and not gmAttack;
+Message := Message and (not gmAttack);
 State := State or gstMoving;
 end;
 RopePoints.Count := 0;
 Gear^.Elasticity := _0;
 Gear^.doStep := @doStepRopeAfterAttack
 PlaySound(sndRopeRelease);
 DeleteMe;
 exit
 end;
-if (Gear^.Message and gmLeft  <> 0) and not TestCollisionXwithGear(HHGear, -1) then
+if (Gear^.Message and gmLeft  <> 0) and (not TestCollisionXwithGear(HHGear, -1)) then
 HHGear^.dX := HHGear^.dX - _0_0002;
-if (Gear^.Message and gmRight <> 0) and not TestCollisionXwithGear(HHGear,  1) then
+if (Gear^.Message and gmRight <> 0) and (not TestCollisionXwithGear(HHGear,  1)) then
 HHGear^.dX := HHGear^.dX + _0_0002;
 // vector between hedgehog and rope attaching point
 ropeDx := HHGear^.X - Gear^.X;
 ropeDy := HHGear^.Y - Gear^.Y;
 if TestCollisionYwithGear(HHGear, 1) <> 0 then
 begin
 CheckHHDamage(HHGear);
 HHGear^.dY := _0
-//HHGear^.State:= HHGear^.State and not (gstHHJumping or gstHHHJump);
+//HHGear^.State:= HHGear^.State and (not (gstHHJumping or gstHHHJump));
 end
 else
 begin
 HHGear^.Y := HHGear^.Y + HHGear^.dY;
 Gear^.Y := Gear^.Y + HHGear^.dY;
 Gear^.Elasticity := tt;
 Gear^.doStep := @doStepRopeWork;
 PlaySound(sndRopeAttach);
 with HHGear^ do
 begin
-State := State and not (gstAttacking or gstHHJumping or gstHHHJump);
+State := State and (not (gstAttacking or gstHHJumping or gstHHHJump));
-Message := Message and not gmAttack
+Message := Message and (not gmAttack)
 end;
 RemoveFromAmmo;
 tt := _0;
 begin
 Gear^.doStep := @doStepRopeWork;
 PlaySound(sndRopeAttach);
 with HHGear^ do
 begin
-State := State and not (gstAttacking or gstHHJumping or gstHHHJump);
+State := State and (not (gstAttacking or gstHHJumping or gstHHHJump));
-Message := Message and not gmAttack
+Message := Message and (not gmAttack)
 end;
 RemoveFromAmmo;
 exit
 or ((HHGear^.State and gstHHDriven) = 0)
 or (HHGear^.Damage > 0) then
 begin
 with Gear^.Hedgehog^.Gear^ do
 begin
-State := State and not gstAttacking;
+State := State and (not gstAttacking);
-Message := Message and not gmAttack
+Message := Message and (not gmAttack)
 end;
 DeleteGear(Gear)
 end;
 CheckGearDrowning(HHGear)
 end;
 vg:= AddVisualGear(hwRound(Gear^.X) - 4  + Random(8), hwRound(Gear^.Y) - 4 - Random(4), vgtSmoke);
 if vg <> nil then vg^.Scale:= 0.5;
 PlaySound(sndVaporize);
 Gear^.Health := 0;
 Gear^.Damage := 0;
-Gear^.State := Gear^.State and not gstAttacking
+Gear^.State := Gear^.State and (not gstAttacking)
 end;
 exit
 end;
 dec(Gear^.Timer);
 end
 DeleteGear(Gear);
 FreeActionsList;
 SetAllToActive;
 // something (hh, mine, etc...) could be on top of the case
 with CurrentHedgehog^ do
-if Gear <> nil then Gear^.Message := Gear^.Message and not (gmLJump or gmHJump);
+if Gear <> nil then Gear^.Message := Gear^.Message and (not (gmLJump or gmHJump));
 exit
 end;
 if k = gtExplosives then
 begin
 Gear^.Tag := hwRound(HHGear^.Y);
 DrawTunnel(HHGear^.X - int2hwFloat(cHHRadius), HHGear^.Y - _1, _0_5, _0, cHHRadius * 4, 2);
 HHGear^.State := HHGear^.State or gstNoDamage;
 Gear^.Y := HHGear^.Y;
 AmmoShove(Gear, 30, 40);
-HHGear^.State := HHGear^.State and not gstNoDamage
+HHGear^.State := HHGear^.State and (not gstNoDamage)
 end;
 HHGear^.dY := HHGear^.dY + cGravity;
 if not (HHGear^.dY.isNegative) then
 begin
 DeleteCI(HHGear);
 AfterAttack;
-HHGear^.State := HHGear^.State and not (gstAttacking or gstAttacked or gstMoving);
+HHGear^.State := HHGear^.State and (not (gstAttacking or gstAttacked or gstMoving));
-HHGear^.Message := HHGear^.Message and not gmAttack;
+HHGear^.Message := HHGear^.Message and (not gmAttack);
 Gear^.doStep := @doStepParachuteWork;
 Gear^.Message := HHGear^.Message;
 doStepParachuteWork(Gear)
 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,
+(not TryPlaceOnLand(Gear^.Target.X - SpritesData[sprAmGirder].Width div 2,
 Gear^.Target.Y - SpritesData[sprAmGirder].Height div 2,
-sprAmGirder, Gear^.State, true, false) then
+sprAmGirder, Gear^.State, true, false)) then
 begin
 PlaySound(sndDenied);
-HHGear^.Message := HHGear^.Message and not gmAttack;
+HHGear^.Message := HHGear^.Message and (not gmAttack);
-HHGear^.State := HHGear^.State and not gstAttacking;
+HHGear^.State := HHGear^.State and (not gstAttacking);
 HHGear^.State := HHGear^.State or gstHHChooseTarget;
 isCursorVisible := true;
 DeleteGear(Gear)
 end
 else
 PlaySound(sndPlaced);
 DeleteGear(Gear);
 AfterAttack;
 end;
-HHGear^.State := HHGear^.State and not (gstAttacking or gstAttacked);
+HHGear^.State := HHGear^.State and (not (gstAttacking or gstAttacked));
-HHGear^.Message := HHGear^.Message and not gmAttack;
+HHGear^.Message := HHGear^.Message and (not gmAttack);
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepTeleportAfter(Gear: PGear);
 var
 HHGear := Gear^.Hedgehog^.Gear;
 if not TryPlaceOnLand(Gear^.Target.X - SpritesData[sprHHTelepMask].Width div 2,
 Gear^.Target.Y - SpritesData[sprHHTelepMask].Height div 2,
 sprHHTelepMask, 0, false, false) then
 begin
-HHGear^.Message := HHGear^.Message and not gmAttack;
+HHGear^.Message := HHGear^.Message and (not gmAttack);
-HHGear^.State := HHGear^.State and not gstAttacking;
+HHGear^.State := HHGear^.State and (not gstAttacking);
 HHGear^.State := HHGear^.State or gstHHChooseTarget;
 DeleteGear(Gear);
 isCursorVisible := true;
 PlaySound(sndDenied)
 end
 HHGear: PGear;
 Msg, State: Longword;
 begin
 AllInactive := false;
-if ((Gear^.Message and not gmSwitch) <> 0) or (TurnTimeLeft = 0) then
+if ((Gear^.Message and (not gmSwitch)) <> 0) or (TurnTimeLeft = 0) then
 begin
 HHGear := Gear^.Hedgehog^.Gear;
-Msg := Gear^.Message and not gmSwitch;
+Msg := Gear^.Message and (not gmSwitch);
 DeleteGear(Gear);
 ApplyAmmoChanges(HHGear^.Hedgehog^);
 HHGear := CurrentHedgehog^.Gear;
 ApplyAmmoChanges(HHGear^.Hedgehog^);
 end;
 if (Gear^.Message and gmSwitch) <> 0 then
 begin
 HHGear := CurrentHedgehog^.Gear;
-HHGear^.Message := HHGear^.Message and not gmSwitch;
+HHGear^.Message := HHGear^.Message and (not gmSwitch);
-Gear^.Message := Gear^.Message and not gmSwitch;
+Gear^.Message := Gear^.Message and (not gmSwitch);
 State := HHGear^.State;
 HHGear^.State := 0;
 HHGear^.Active := false;
 HHGear^.Z := cHHZ;
 RemoveGearFromList(HHGear);
 HHGear := Gear^.Hedgehog^.Gear;
 OnUsedAmmo(HHGear^.Hedgehog^);
 with HHGear^ do
 begin
-State := State and not gstAttacking;
+State := State and (not gstAttacking);
-Message := Message and not gmAttack
+Message := Message and (not gmAttack)
 end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepMortar(Gear: PGear);
 t := CheckGearsCollision(Gear);
 //fixes drill not exploding when touching HH bug
 if (Gear^.Timer = 0) or (t^.Count <> 0) or
 ( ((Gear^.State and gsttmpFlag) = 0) and
 (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0)
-and not TestCollisionXWithGear(Gear, hwSign(Gear^.dX)))
+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
 StopSound(Gear^.SoundChannel);
 if (Gear^.State and gsttmpFlag) <> 0 then
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound)
 else
 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
 StopSound(Gear^.SoundChannel);
 Gear^.Tag := 1;
 Gear^.doStep := @doStepDrill
 end;
 procedure doStepBallgun(Gear: PGear);
 var
 HHGear: PGear;
 begin
 HHGear := Gear^.Hedgehog^.Gear;
-HHGear^.Message := HHGear^.Message and not (gmUp or gmDown);
+HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown));
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.doStep := @doStepBallgunWork
 end;
 ////////////////////////////////////////////////////////////////////////////////
 else
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
 if ((HHGear^.Message and gmAttack) <> 0) and (Gear^.Health <> 0) then
 begin
-HHGear^.Message := HHGear^.Message and not gmAttack;
+HHGear^.Message := HHGear^.Message and (not gmAttack);
 AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtAirBomb, 0, Gear^.dX * _0_5, Gear^.dY *
 _0_5, 0);
 dec(Gear^.Health)
 end;
 if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
 TurnTimeLeft:= 14 * 125;
 end;
 HHGear^.Message := 0;
-ParseCommand('/taunt '#1, true)
+ParseCommand('/taunt ' + #1, true)
 end
 end;
 procedure doStepRCPlane(Gear: PGear);
 var
 FreeTexture(Gear^.Tex);
 Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(i) +
 '%', cWhiteColor, fntSmall)
 end;
-if HHGear^.Message and (gmAttack or gmUp or gmPrecise or gmLeft or gmRight) <> 0 then Gear^
+if HHGear^.Message and (gmAttack or gmUp or gmPrecise or gmLeft or gmRight) <> 0 then
-.State := Gear^.State and not gsttmpFlag;
+Gear^.State := Gear^.State and (not gsttmpFlag);
-HHGear^.Message := HHGear^.Message and not (gmUp or gmPrecise or gmLeft or gmRight);
+HHGear^.Message := HHGear^.Message and (not (gmUp or gmPrecise or gmLeft or gmRight));
 HHGear^.State := HHGear^.State or gstMoving;
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y;
 // For some reason I need to reapply followgear here, something else grabs it otherwise.
 HHGear := Gear^.Hedgehog^.Gear;
 FollowGear := HHGear;
 AfterAttack;
 with HHGear^ do
 begin
-State := State and not gstAttacking;
+State := State and (not gstAttacking);
-Message := Message and not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight);
+Message := Message and (not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight));
 if (dY < _0_1) and (dY > -_0_1) then
 begin
 Gear^.State := Gear^.State or gsttmpFlag;
 dY := dY - _0_2
 end
 for i:= ((500-Gear^.Health) div 250) downto 0 do
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtFeather);
 if (HHGear^.Message and gmAttack <> 0) then
 begin
-HHGear^.Message := HHGear^.Message and not gmAttack;
+HHGear^.Message := HHGear^.Message and (not gmAttack);
 if Gear^.FlightTime > 0 then
 begin
 AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) + 32, gtEgg, 0, Gear^.dX * _0_5, Gear^.dY, 0);
 PlaySound(sndBirdyLay);
 dec(Gear^.FlightTime)
 end;
 end;
 if HHGear^.Message and (gmUp or gmPrecise or gmLeft or gmRight) <> 0 then
-Gear^.State := Gear^.State and not gsttmpFlag;
+Gear^.State := Gear^.State and (not gsttmpFlag);
-HHGear^.Message := HHGear^.Message and not (gmUp or gmPrecise or gmLeft or gmRight);
+HHGear^.Message := HHGear^.Message and (not (gmUp or gmPrecise or gmLeft or gmRight));
 HHGear^.State := HHGear^.State or gstMoving;
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y - int2hwFloat(32);
 // For some reason I need to reapply followgear here, something else grabs it otherwise.
 DeleteGear(Gear);
 AfterAttack;
 exit
 end;
 HHGear := Gear^.Hedgehog^.Gear;
-HHGear^.Message := HHGear^.Message and not (gmUp or gmPrecise or gmLeft or gmRight);
+HHGear^.Message := HHGear^.Message and (not (gmUp or gmPrecise or gmLeft or gmRight));
 if abs(hwRound(HHGear^.Y - Gear^.Y)) > 32 then
 begin
 if Gear^.Timer = 0 then
 Gear^.Y := Gear^.Y + _0_1
 end
 else
 begin
 Gear^.Timer := 500;
 Gear^.dX := _0;
 Gear^.dY := _0;
-Gear^.State :=  Gear^.State and not gstAnimation;
+Gear^.State :=  Gear^.State and (not gstAnimation);
 Gear^.doStep := @doStepBirdyDescend;
 end
 end;
 procedure doStepBirdy(Gear: PGear);
 var
 HHGear: PGear;
 begin
-gear^.State :=  gear^.State or gstAnimation and not gstTmpFlag;
+gear^.State :=  gear^.State or gstAnimation and (not gstTmpFlag);
 Gear^.doStep := @doStepBirdyAppear;
 if CurrentHedgehog = nil then
 begin
 DeleteGear(Gear);
 exit
 Gear^.Pos := 0;
 AllInactive := false;
 FollowGear := HHGear;
 with HHGear^ do
 begin
-State := State and not gstAttacking;
+State := State and (not gstAttacking);
-Message := Message and not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight)
+Message := Message and (not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight))
 end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepEggWork(Gear: PGear);
 var CurWeapon: PAmmo;
 begin
 if (CurrentHedgehog <> nil)
 and (CurrentHedgehog^.Gear <> nil)
 and ((CurrentHedgehog^.Gear^.Message and gmSwitch) <> 0) then
-With CurrentHedgehog^ do
+with CurrentHedgehog^ do
 if (CurAmmoType = amPortalGun) then
 begin
-CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and not gmSwitch;
+CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and (not gmSwitch);
 CurWeapon:= GetAmmoEntry(CurrentHedgehog^);
 if CurWeapon^.Pos <> 0 then
 CurWeapon^.Pos := 0
 else
 if not isBullet and poffs.isNegative then
 continue;
 // only port bullets close to the portal
-if isBullet and not (hwAbs(poffs) < _3) then
+if isBullet and (not (hwAbs(poffs) < _3)) then
 continue;
 //
 // gears that make it till here will definately be ported
 //
 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
 // Until loops are reliably broken
 if iscake then iterator^.PortalCounter:= 33
 else
 begin
 inc(iterator^.PortalCounter);
-iterator^.State:= iterator^.State and not gstHHHJump
+iterator^.State:= iterator^.State and (not gstHHHJump)
 end;
 if not isbullet and (iterator^.Kind <> gtFlake) then
 FollowGear := iterator;
 // avoid compiler hints
 if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y, x] > 255) then
 begin
 Gear^.State := Gear^.State or gstCollision;
-Gear^.State := Gear^.State and not gstMoving;
+Gear^.State := Gear^.State and (not gstMoving);
 if 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;
 begin
 CurWeapon:= GetAmmoEntry(CurrentHedgehog^);
 // let's save the HH's dX's direction so we can decide where the "top" of the portal hole
 newPortal^.Elasticity.isNegative := CurrentHedgehog^.Gear^.dX.isNegative;
 // when doing a backjump the dx is the opposite of the facing direction
-if ((Gear^.State and gstHHHJump) <> 0) and not cArtillery then
+if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery) then
 newPortal^.Elasticity.isNegative := not newPortal^.Elasticity.isNegative;
 // make portal gun look unloaded
 if (CurWeapon <> nil) and (CurAmmoType = amPortalGun) then
 CurWeapon^.Timer := CurWeapon^.Timer or 2;
 end;
 iterator^.PortalCounter:= 0;
 iterator := iterator^.NextGear
 end;
 end;
-newPortal^.State := newPortal^.State and not gstCollision;
+newPortal^.State := newPortal^.State and (not gstCollision);
 newPortal^.State := newPortal^.State or gstMoving;
 newPortal^.doStep := @doStepMovingPortal;
 end;
 ////////////////////////////////////////////////////////////////////////////////
 7: PlaySound(sndPiano7);
 else PlaySound(sndPiano8);
 end;
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtNote);
 CurrentHedgehog^.Gear^.MsgParam := 0;
-CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and not gmSlot;
+CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and (not gmSlot);
 end;
 if (*((Gear^.Pos = 3) and ((GameFlags and gfSolidLand) <> 0)) or*) (Gear^.Pos = 5) then
 begin
 Gear^.dY := Gear^.dY + cGravity * 2;
 procedure doStepFlamethrower(Gear: PGear);
 var
 HHGear: PGear;
 begin
 HHGear := Gear^.Hedgehog^.Gear;
-HHGear^.Message := HHGear^.Message and not (gmUp or gmDown or gmLeft or gmRight);
+HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown or gmLeft or gmRight));
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.doStep := @doStepFlamethrowerWork
 end;
 ////////////////////////////////////////////////////////////////////////////////
 Gear^.Timer:= Gear^.Tag
 end;
 if (Gear^.Health = 0) or (HHGear^.Damage <> 0) or ((HHGear^.Message and gmAttack) <> 0) then
 begin
-HHGear^.Message:= HHGear^.Message and not gmAttack;
+HHGear^.Message:= HHGear^.Message and (not gmAttack);
 DeleteGear(Gear);
 AfterAttack
 end
 else
 begin
 procedure doStepLandGun(Gear: PGear);
 var
 HHGear: PGear;
 begin
 HHGear := Gear^.Hedgehog^.Gear;
-HHGear^.Message := HHGear^.Message and not (gmUp or gmDown or gmLeft or gmRight or gmAttack);
+HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown or gmLeft or gmRight or gmAttack));
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.doStep := @doStepLandGunWork
 end;
 ////////////////////////////////////////////////////////////////////////////////
 else
 begin
 end
 end;
-HHGear^.State:= HHGear^.State and not gstNoDamage;
+HHGear^.State:= HHGear^.State and (not gstNoDamage);
 Gear^.Timer:= 250;
 Gear^.doStep:= @doStepIdle
 end;
 procedure doStepHammerHitWork(Gear: PGear);
 if (Gear^.State and gstMoving) <> 0 then
 begin
 AddGearCI(Gear);
 Gear^.dX:= _0;
 Gear^.dY:= _0;
-Gear^.State:= Gear^.State and not gstMoving;
+Gear^.State:= Gear^.State and (not gstMoving);
 end;
 if CurAmmoGear = Gear then
 begin
 if (CurrentHedgehog = nil) or (CurrentHedgehog^.Gear = nil) then
 if Gear = CurAmmoGear then CurAmmoGear := nil;
 Gear^.Hedgehog:= CurrentHedgehog;
 RemoveGearFromList(CurrentHedgehog^.Gear);
 CurrentHedgehog^.Gear^.Z := cHHZ;
 CurrentHedgehog^.Gear^.Active := false;
-CurrentHedgehog^.Gear^.State:= CurrentHedgehog^.Gear^.State and not gstHHDriven;
+CurrentHedgehog^.Gear^.State:= CurrentHedgehog^.Gear^.State and (not gstHHDriven);
 CurrentHedgehog^.GearHidden:= CurrentHedgehog^.Gear;
 CurrentHedgehog^.Gear:= nil;
 Gear^.Tag:= TotalRounds + Gear^.Tag;
 AddGearCI(Gear);
 end;
 if HH^.Gear <> nil then
 if (HH^.Gear = nil) or (HH^.King) or (SuddenDeathDmg) then
 begin
 if HH^.Gear <> nil then
 begin
-HH^.Gear^.Message := HH^.Gear^.Message and not gmAttack;
+HH^.Gear^.Message := HH^.Gear^.Message and (not gmAttack);
-HH^.Gear^.State:= HH^.Gear^.State and not gstAttacking;
+HH^.Gear^.State:= HH^.Gear^.State and (not gstAttacking);
 end;
 PlaySound(sndDenied);
 DeleteGear(gear);
 exit
 end;
 HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.Damage) then inc(cnt);
 if cnt < 2 then
 begin
 if HH^.Gear <> nil then
 begin
-HH^.Gear^.Message := HH^.Gear^.Message and not gmAttack;
+HH^.Gear^.Message := HH^.Gear^.Message and (not gmAttack);
-HH^.Gear^.State:= HH^.Gear^.State and not gstAttacking;
+HH^.Gear^.State:= HH^.Gear^.State and (not gstAttacking);
 end;
 PlaySound(sndDenied);
 DeleteGear(gear);
 exit
 end;

changeset 6450	14224c9b4594
parent 6419	6a464d0a5c13
child 6452	7c6f9b6672dc