hedgewars: comparison hedgewars/uGearsHedgehog.pas

equal deleted inserted replaced

-:fc52f7c22c9b
+:6155187bf599
 with HHGear^.Hedgehog^ do
 begin
 HHGear^.Message:= HHGear^.Message and (not gmSlot);
 ammoidx:= 0;
-if ((HHGear^.State and (gstAttacking or gstAttacked)) <> 0) or
+if ((HHGear^.State and (gstAttacking or gstAttacked)) <> 0)
-((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0)) or
+or ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0))
-((HHGear^.State and gstHHDriven) = 0) then exit;
+or ((HHGear^.State and gstHHDriven) = 0) then
+exit;
 ChangeAmmo:= true;
-while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do inc(ammoidx);
+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^);
+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));
 if Ammoz[CurAmmoType].Slot = slot then
 inc(i);
 CurAmmoType:= amNothing;
 ammoidx:= -1;
 //TryDo(i < 2, 'Engine bug: no ammo in current slot', true)
 end;
-until (i = 1) or ((Ammo^[slot, ammoidx].Count > 0) and (Team^.Clan^.TurnNumber > Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns))
+until (i = 1) or ((Ammo^[slot, ammoidx].Count > 0)
+and (Team^.Clan^.TurnNumber > Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns))
 end
 else
 begin
 i:= 0;
 // check whether there is ammo in slot
-while (i <= cMaxSlotAmmoIndex)
+while (i <= cMaxSlotAmmoIndex) and ((Ammo^[slot, i].Count = 0)
-and ((Ammo^[slot, i].Count = 0)
+or (Team^.Clan^.TurnNumber <= Ammoz[Ammo^[slot, i].AmmoType].SkipTurns))
-or (Team^.Clan^.TurnNumber <= Ammoz[Ammo^[slot, i].AmmoType].SkipTurns)) do inc(i);
+do inc(i);
-if i <= cMaxSlotAmmoIndex then ammoidx:= i
+if i <= cMaxSlotAmmoIndex then
+ammoidx:= i
 else ammoidx:= -1
 end;
-if ammoidx >= 0 then CurAmmoType:= Ammo^[slot, ammoidx].AmmoType;
+if ammoidx >= 0 then
+CurAmmoType:= Ammo^[slot, ammoidx].AmmoType;
 end
 end;
 procedure HHSetWeapon(HHGear: PGear);
 var t: LongInt;
 s:= false;
 weap:= TAmmoType(HHGear^.MsgParam);
 Hedgehog:= HHGear^.Hedgehog;
-if Hedgehog^.Team^.Clan^.TurnNumber <= Ammoz[weap].SkipTurns then exit; // weapon is not activated yet
+if Hedgehog^.Team^.Clan^.TurnNumber <= Ammoz[weap].SkipTurns then
+exit; // weapon is not activated yet
 HHGear^.MsgParam:= Ammoz[weap].Slot;
 t:= cMaxSlotAmmoIndex;
 begin
 s:= ChangeAmmo(HHGear);
 dec(t)
 end;
-if s then ApplyAmmoChanges(HHGear^.Hedgehog^)
+if s then
+ApplyAmmoChanges(HHGear^.Hedgehog^)
 end;
 procedure HHSetTimer(Gear: PGear);
 var CurWeapon: PAmmo;
 color: LongWord;
 begin
 newGear:= nil;
 bShowFinger:= false;
 CurWeapon:= GetAmmoEntry(Gear^.Hedgehog^);
 with Gear^,
 Gear^.Hedgehog^ do
 begin
-if ((State and gstHHDriven) <> 0)and
+if ((State and gstHHDriven) <> 0) and ((State and (gstAttacked or gstHHChooseTarget)) = 0) and (((State and gstMoving) = 0)
-((State and (gstAttacked or gstHHChooseTarget)) = 0) and
+or (Power > 0)
-(((State and gstMoving) = 0) or
+or (CurAmmoType = amTeleport)
-(Power > 0) or
+or
-(CurAmmoType = amTeleport) or
+// Allow attacks while moving on ammo with AltAttack
-// Allow attacks while moving on ammo with AltAttack
+((CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0))
-((CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0)) or
+or ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackInMove) <> 0))
-((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackInMove) <> 0)) and
+and ((TargetPoint.X <> NoPointX) or ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) = 0)) then
-((TargetPoint.X <> NoPointX) or ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) = 0)) then
+begin
-begin
+State:= State or gstAttacking;
-State:= State or gstAttacking;
+if Power = cMaxPower then
-if Power = cMaxPower then Message:= Message and (not gmAttack)
+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
-else begin
+Message:= Message and (not gmAttack)
-if Power = 0 then
+else
 begin
-AttackBar:= CurrentTeam^.AttackBar;
+if Power = 0 then
-PlaySound(sndThrowPowerUp)
+begin
+AttackBar:= CurrentTeam^.AttackBar;
+PlaySound(sndThrowPowerUp)
+end;
+inc(Power)
 end;
-inc(Power)
+if ((Message and gmAttack) <> 0) then
-end;
+exit;
-if ((Message and gmAttack) <> 0) then exit;
 if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_Power) <> 0 then
 begin
 StopSound(sndThrowPowerUp);
 PlaySound(sndThrowRelease);
 end;
 xx:= SignAs(AngleSin(Angle), dX);
 yy:= -AngleCos(Angle);
 lx:= X + int2hwfloat(round(GetLaunchX(CurAmmoType, hwSign(dX), Angle)));
 ly:= Y + int2hwfloat(round(GetLaunchY(CurAmmoType, Angle)));
-if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery) then xx:= - xx;
+if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery) then
+xx:= - xx;
 if Ammoz[CurAmmoType].Ammo.AttackVoice <> sndNone then
 AddVoice(Ammoz[CurAmmoType].Ammo.AttackVoice, CurrentTeam^.voicepack);
 // Initiating alt attack
-if  (CurAmmoGear <> nil) and
+if  (CurAmmoGear <> nil)
-((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) and
+and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0)
-((Gear^.Message and gmLJump) <> 0) and
+and ((Gear^.Message and gmLJump) <> 0)
-((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) then
+and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) then
 begin
 newDx:= dX / _2;
 newDy:= dY / _2;
 altUse:= true;
 end
 end;
 amPickHammer: newGear:= AddGear(hwRound(lx), hwRound(ly) + cHHRadius, gtPickHammer, 0, _0, _0, 0);
 amSkip: ParseCommand('/skip', true);
 amRope: newGear:= AddGear(hwRound(lx), hwRound(ly), gtRope, 0, xx, yy, 0);
 amMine: if altUse then
 newGear:= AddGear(hwRound(lx) + hwSign(dX) * 7, hwRound(ly), gtMine, gstWait, newDx, newDy, 3000)
 else
 newGear:= AddGear(hwRound(lx) + hwSign(dX) * 7, hwRound(ly), gtMine, gstWait, SignAs(_0_02, dX), _0, 3000);
 amSMine: newGear:= AddGear(hwRound(lx), hwRound(ly), gtSMine,    0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0);
 amDEagle: newGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtDEagleShot, 0, xx * _0_5, yy * _0_5, 0);
 amSineGun: newGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtSineGunShot, 0, xx * _0_5, yy * _0_5, 0);
 amPortalGun: begin
 newGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtPortal, 0, xx * _0_6, yy * _0_6,
 end;
 amRCPlane: begin
 newGear:= AddGear(hwRound(lx), hwRound(ly), gtRCPlane,  0, xx * cMaxPower / cPowerDivisor / 4, yy * cMaxPower / cPowerDivisor / 4, 0);
 newGear^.SoundChannel:= LoopSound(sndRCPlane, nil)
 end;
 amKamikaze: newGear:= AddGear(hwRound(lx), hwRound(ly), gtKamikaze, 0, xx * _0_5, yy * _0_5, 0);
 amCake: newGear:= AddGear(hwRound(lx) + hwSign(dX) * 3, hwRound(ly), gtCake, 0, xx, _0, 0);
 amSeduction: newGear:= AddGear(hwRound(lx), hwRound(ly), gtSeduction, 0, _0, _0, 0);
 amWatermelon: newGear:= AddGear(hwRound(lx), hwRound(ly), gtWatermelon,  0, newDx, newDy, CurWeapon^.Timer);
 amHellishBomb: newGear:= AddGear(hwRound(lx), hwRound(ly), gtHellishBomb,    0, newDx, newDy, 0);
 amDrill: newGear:= AddGear(hwRound(lx), hwRound(ly), gtDrill, 0, newDx, newDy, 0);
 amBallgun: newGear:= AddGear(hwRound(X), hwRound(Y), gtBallgun,  0, xx * _0_5, yy * _0_5, 0);
 amJetpack: newGear:= AddGear(hwRound(lx), hwRound(ly), gtJetpack, 0, _0, _0, 0);
 amBirdy: begin
 PlaySound(sndWhistle);
 newGear:= AddGear(hwRound(lx), hwRound(ly) - 32, gtBirdy, 0, _0, _0, 0);
 end;
 amLowGravity: begin
 PlaySound(sndLowGravity);
 cGravity:= cMaxWindSpeed;
 cGravityf:= 0.00025
 end;
-amExtraDamage:begin
+amExtraDamage: begin
 PlaySound(sndHellishImpact4);
 cDamageModifier:= _1_5
 end;
 amInvulnerable: Invulnerable:= true;
-amExtraTime:  begin
+amExtraTime: begin
 PlaySound(sndSwitchHog);
 TurnTimeLeft:= TurnTimeLeft + 30000
 end;
 amLaserSight: cLaserSighting:= true;
 amVampiric: begin
 PlaySound(sndOw1, Team^.voicepack);
 cVampiric:= true;
 end;
 amPiano: begin
 // Tuck the hedgehog away until the piano attack is completed
 Unplaced:= true;
 X:= _0;
 Y:= _0;
 newGear:= AddGear(TargetPoint.X, 0, gtPiano, 0, _0, _0, 0);
 PauseMusic
 end;
 amFlamethrower: newGear:= AddGear(hwRound(X), hwRound(Y), gtFlamethrower,  0, xx * _0_5, yy * _0_5, 0);
 amLandGun: newGear:= AddGear(hwRound(X), hwRound(Y), gtLandGun,  0, xx * _0_5, yy * _0_5, 0);
 amResurrector: begin
-newGear:= AddGear(hwRound(lx), hwRound(ly),
+newGear:= AddGear(hwRound(lx), hwRound(ly), gtResurrector, 0, _0, _0, 0);
-gtResurrector, 0, _0, _0, 0);
+newGear^.SoundChannel := LoopSound(sndResurrector);
-newGear^.SoundChannel := LoopSound(sndResurrector);
+end;
-end;
+//amMelonStrike: AddGear(CurWeapon^.Pos, 0, gtAirAttack, 4, _0, _0, 0);
-//amMelonStrike: AddGear(CurWeapon^.Pos, 0, gtAirAttack, 4, _0, _0, 0);
+amStructure: newGear:= AddGear(hwRound(lx) + hwSign(dX) * 7, hwRound(ly), gtStructure, gstWait, SignAs(_0_02, dX), _0, 3000);
-amStructure: newGear:= AddGear(hwRound(lx) + hwSign(dX) * 7, hwRound(ly), gtStructure, gstWait, SignAs(_0_02, dX), _0, 3000);
+amTardis: newGear:= AddGear(hwRound(X), hwRound(Y), gtTardis, 0, _0, _0, 5000);
-amTardis: newGear:= AddGear(hwRound(X), hwRound(Y), gtTardis, 0, _0, _0, 5000);
+end;
-end;
 case CurAmmoType of
 amGrenade, amMolotov,
 amClusterBomb, amGasBomb,
 amBazooka, amSnowball,
 amBee, amSMine,
 amSeduction, amBallgun,
 amJetpack, amBirdy,
 amFlamethrower, amLandGun,
 amResurrector, amStructure,
 amTardis, amPiano: CurAmmoGear:= newGear;
 end;
-if ((CurAmmoType = amMine) or (CurAmmoType = amSMine)) and (GameFlags and gfInfAttack <> 0) then
-newGear^.FlightTime:= GameTicks + 1000
+if ((CurAmmoType = amMine) or (CurAmmoType = amSMine)) and (GameFlags and gfInfAttack <> 0) then
-else if CurAmmoType = amDrill then newGear^.FlightTime:= GameTicks + 250;
+newGear^.FlightTime:= GameTicks + 1000
+else if CurAmmoType = amDrill then
+newGear^.FlightTime:= GameTicks + 250;
 if Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0 then
 begin
 newGear^.Target.X:= TargetPoint.X;
 newGear^.Target.Y:= TargetPoint.Y
 end;
 // Clear FollowGear if using on a rope/parachute/saucer etc so focus stays with the hog's movement
-if altUse then FollowGear:= nil;
+if altUse then
+FollowGear:= nil;
 if (newGear <> nil) and ((Ammoz[newGear^.AmmoType].Ammo.Propz and ammoprop_SetBounce) <> 0) then
 begin
 elastic:=  int2hwfloat(CurWeapon^.Bounciness) / _1000;
-if elastic < _1 then newGear^.Elasticity:= newGear^.Elasticity * elastic
+if elastic < _1 then
-else if elastic > _1 then newGear^.Elasticity:= _1 - ((_1-newGear^.Elasticity) / elastic);
+newGear^.Elasticity:= newGear^.Elasticity * elastic
+else if elastic > _1 then
+newGear^.Elasticity:= _1 - ((_1-newGear^.Elasticity) / elastic);
 (* Experimented with friction modifier. Didn't seem helpful
 fric:= int2hwfloat(CurWeapon^.Bounciness) / _250;
 if fric < _1 then newGear^.Friction:= newGear^.Friction * fric
 else if fric > _1 then newGear^.Friction:= _1 - ((_1-newGear^.Friction) / fric)*)
 end;
 if not (SpeechText = '') then
 begin
 speech:= AddVisualGear(0, 0, vgtSpeechBubble);
 if speech <> nil then
 begin
 speech^.Text:= SpeechText;
 speech^.Hedgehog:= Gear^.Hedgehog;
 speech^.FrameTicks:= SpeechType;
 end;
 SpeechText:= ''
 end;
 Power:= 0;
 if (CurAmmoGear <> nil)
 and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AltUse) = 0){check for dropping ammo from rope} then
 begin
 Message:= Message or gmAttack;
 CurAmmoGear^.Message:= Message
-end else begin
+end
-if not CurrentTeam^.ExtDriven and
+else
-((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_Power) <> 0) then SendIPC('a');
+begin
-AfterAttack;
+if not CurrentTeam^.ExtDriven
-end
+and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_Power) <> 0) then
-end else Message:= Message and (not gmAttack);
+SendIPC('a');
-end;
+AfterAttack;
-TargetPoint.X := NoPointX;
+end
-ScriptCall('onHogAttack');
+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^,
+with CurrentHedgehog^.Gear^, CurrentHedgehog^ do
-CurrentHedgehog^ do
 begin
 a:= CurAmmoType;
 State:= State and (not gstAttacking);
 if (Ammoz[a].Ammo.Propz and ammoprop_Effect) = 0 then
 begin
 begin
 s:= inttostr(Ammoz[a].Ammo.NumPerTurn - MultiShootAttacks + 1);
 AddCaption(format(trmsg[sidRemaining], s), cWhiteColor, capgrpAmmostate);
 end;
-if (Ammoz[a].Ammo.NumPerTurn >= MultiShootAttacks) or
+if (Ammoz[a].Ammo.NumPerTurn >= MultiShootAttacks)
-((GameFlags and gfMultiWeapon) <> 0) then
+or ((GameFlags and gfMultiWeapon) <> 0) then
 begin
 isInMultiShoot:= true
 end
 else
 begin
 OnUsedAmmo(CurrentHedgehog^);
 if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and (((GameFlags and gfInfAttack) = 0) or PlacingHogs) then
 begin
-if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
+if TagTurnTimeLeft = 0 then
+TagTurnTimeLeft:= TurnTimeLeft;
 TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 100;
 end;
-if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) then State:= State or gstAttacked;
+if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) then
-if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then ApplyAmmoChanges(CurrentHedgehog^)
+State:= State or gstAttacked;
+if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then
+ApplyAmmoChanges(CurrentHedgehog^)
 end;
 end
 else
 begin
 OnUsedAmmo(CurrentHedgehog^);
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepHedgehogDead(Gear: PGear);
 const frametime = 200;
 timertime = frametime * 6;
 begin
-if Gear^.Hedgehog^.Unplaced then exit;
+if Gear^.Hedgehog^.Unplaced then
+exit;
 if Gear^.Timer > 1 then
 begin
 AllInactive:= false;
 dec(Gear^.Timer);
-if (Gear^.Timer mod frametime) = 0 then inc(Gear^.Pos)
+if (Gear^.Timer mod frametime) = 0 then
+inc(Gear^.Pos)
 end
 else if Gear^.Timer = 1 then
 begin
 Gear^.State:= Gear^.State or gstNoDamage;
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, CurrentHedgehog, EXPLAutoSound);
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepHedgehogGone(Gear: PGear);
 const frametime = 65;
 timertime = frametime * 11;
 begin
-if Gear^.Hedgehog^.Unplaced then exit;
+if Gear^.Hedgehog^.Unplaced then
+exit;
 if Gear^.Timer > 1 then
 begin
 AllInactive:= false;
 dec(Gear^.Timer);
-if (Gear^.Timer mod frametime) = 0 then inc(Gear^.Pos)
+if (Gear^.Timer mod frametime) = 0 then
-end else
+inc(Gear^.Pos)
+end
+else
 if Gear^.Timer = 1 then
 begin
 DeleteGear(Gear);
 SetAllToActive
-end else // Gear^.Timer = 0
+end
+else // Gear^.Timer = 0
 begin
 AllInactive:= false;
 Gear^.Z:= cCurrHHZ;
 RemoveGearFromList(Gear);
 InsertGearToList(Gear);
 posCaseUtility,
 posCaseAmmo: begin
 if Gear^.AmmoType <> amNothing then a:= Gear^.AmmoType
 else
 begin
-for i:= 0 to GameTicks and $7F do GetRandom(2); // Burn some random numbers
+for i:= 0 to GameTicks and $7F do
-if Gear^.Pos = posCaseUtility then a:= GetUtility(HH^.Hedgehog)
+GetRandom(2); // Burn some random numbers
-else a:= GetAmmo(HH^.Hedgehog)
+if Gear^.Pos = posCaseUtility then
+a:= GetUtility(HH^.Hedgehog)
+else
+a:= GetAmmo(HH^.Hedgehog)
 end;
 AddAmmo(HH^.Hedgehog^, a);
 // Possibly needs to check shared clan ammo game flag once added.
 // On the other hand, no obvious reason that clan members shouldn't know what ammo another clan member picked up
 if (not (HH^.Hedgehog^.Team^.ExtDriven
 or (HH^.Hedgehog^.BotLevel > 0)))
 or (HH^.Hedgehog^.Team^.Clan^.ClanIndex = LocalClan)
 or (GameType = gmtDemo)  then
 begin
 s:= trammo[Ammoz[a].NameId] + ' (+' + IntToStr(Ammoz[a].NumberInCase) + ')';
 AddCaption(s, HH^.Hedgehog^.Team^.Clan^.Color, capgrpAmmoinfo);
 // show ammo icon
 var PrevdX: LongInt;
 CurWeapon: PAmmo;
 begin
 CurWeapon:= GetAmmoEntry(Gear^.Hedgehog^);
 if ((Gear^.State and (gstAttacking or gstMoving)) = 0) then
 begin
 if isCursorVisible then
 with Gear^.Hedgehog^ do
 with CurWeapon^ do
 begin
 if (Gear^.Message and gmLeft  ) <> 0 then
 Pos:= (Pos - 1 + Ammoz[AmmoType].PosCount) mod Ammoz[AmmoType].PosCount
 else
 if (Gear^.Message and gmRight ) <> 0 then
 Pos:= (Pos + 1) mod Ammoz[AmmoType].PosCount
-else exit;
+else
-StepTicks:= 200;
+exit;
-exit
+StepTicks:= 200;
-end;
+exit
+end;
 if ((Gear^.Message and gmAnimate) <> 0) then
 begin
 Gear^.Message:= 0;
 Gear^.State:= Gear^.State or gstAnimation;
 Gear^.Tag:= Gear^.MsgParam;
 Gear^.Timer:= 0;
 Gear^.Pos:= 0
 end;
 if ((Gear^.Message and gmLJump ) <> 0) then
 begin
 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, -2, hwSign(Gear^.dX)) then
-if not TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - _1;
+Gear^.Y:= Gear^.Y - _2
-if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX))
+else
-or   (TestCollisionYwithGear(Gear, -1) <> 0)) then
+if not TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) then
-begin
+Gear^.Y:= Gear^.Y - _1;
-Gear^.dY:= -_0_15;
+if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX))
-if not cArtillery then Gear^.dX:= SignAs(_0_15, Gear^.dX);
+or   (TestCollisionYwithGear(Gear, -1) <> 0)) then
-Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
+begin
-PlaySound(sndJump1, Gear^.Hedgehog^.Team^.voicepack);
+Gear^.dY:= -_0_15;
-exit
+if not cArtillery then
-end;
+Gear^.dX:= SignAs(_0_15, Gear^.dX);
-end;
+Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
+PlaySound(sndJump1, Gear^.Hedgehog^.Team^.voicepack);
-if ((Gear^.Message and gmHJump ) <> 0) then
+exit
-begin
+end;
-DeleteCI(Gear);
+end;
-Gear^.Message:= Gear^.Message and (not gmHJump);
+if ((Gear^.Message and gmHJump ) <> 0) then
-Gear^.dY:= -_0_2;
+begin
-SetLittle(Gear^.dX);
+DeleteCI(Gear);
-Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
+Gear^.Message:= Gear^.Message and (not gmHJump);
-PlaySound(sndJump3, Gear^.Hedgehog^.Team^.voicepack);
-exit
+Gear^.dY:= -_0_2;
-end;
+SetLittle(Gear^.dX);
+Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
-PrevdX:= hwSign(Gear^.dX);
+PlaySound(sndJump3, Gear^.Hedgehog^.Team^.voicepack);
-if (Gear^.Message and gmLeft  )<>0 then Gear^.dX:= -cLittle else
+exit
-if (Gear^.Message and gmRight )<>0 then Gear^.dX:=  cLittle else exit;
+end;
-if (Gear^.Message and (gmLeft or gmRight)) <> 0 then
+PrevdX:= hwSign(Gear^.dX);
-begin
+if (Gear^.Message and gmLeft  )<>0 then
-StepSoundTimer:= cHHStepTicks;
+Gear^.dX:= -cLittle else
-end;
+if (Gear^.Message and gmRight )<>0 then
+Gear^.dX:=  cLittle else exit;
+if (Gear^.Message and (gmLeft or gmRight)) <> 0 then
+begin
+StepSoundTimer:= cHHStepTicks;
+end;
 StepTicks:= cHHStepTicks;
 if PrevdX <> hwSign(Gear^.dX) then
 begin
 FollowGear:= Gear;
 exit
 end;
 DeleteCI(Gear); // must be after exit!! (see previous line)
 Gear^.Hedgehog^.visStepPos:= (Gear^.Hedgehog^.visStepPos + 1) and 7;
 if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
 begin
 if not (TestCollisionXwithXYShift(Gear, _0, -6, hwSign(Gear^.dX))
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
+or (TestCollisionYwithGear(Gear, -1) <> 0)) then
-if not (TestCollisionXwithXYShift(Gear, _0, -5, hwSign(Gear^.dX))
+Gear^.Y:= Gear^.Y - _1;
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
+if not (TestCollisionXwithXYShift(Gear, _0, -5, hwSign(Gear^.dX))
-if not (TestCollisionXwithXYShift(Gear, _0, -4, hwSign(Gear^.dX))
+or (TestCollisionYwithGear(Gear, -1) <> 0)) then
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
+Gear^.Y:= Gear^.Y - _1;
-if not (TestCollisionXwithXYShift(Gear, _0, -3, hwSign(Gear^.dX))
+if not (TestCollisionXwithXYShift(Gear, _0, -4, hwSign(Gear^.dX))
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
+or (TestCollisionYwithGear(Gear, -1) <> 0)) then
-if not (TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX))
+Gear^.Y:= Gear^.Y - _1;
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
+if not (TestCollisionXwithXYShift(Gear, _0, -3, hwSign(Gear^.dX))
-if not (TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX))
+or (TestCollisionYwithGear(Gear, -1) <> 0)) then
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
+Gear^.Y:= Gear^.Y - _1;
-end;
+if not (TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX))
+or (TestCollisionYwithGear(Gear, -1) <> 0)) then
-if (not cArtillery) and ((Gear^.Message and gmPrecise) = 0) and (not TestCollisionXwithGear(Gear, hwSign(Gear^.dX))) then
+Gear^.Y:= Gear^.Y - _1;
-Gear^.X:= Gear^.X + SignAs(_1, Gear^.dX);
+if not (TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX))
+or (TestCollisionYwithGear(Gear, -1) <> 0)) then
+Gear^.Y:= Gear^.Y - _1;
+end;
+if (not cArtillery) and ((Gear^.Message and gmPrecise) = 0) and (not TestCollisionXwithGear(Gear, hwSign(Gear^.dX))) then
+Gear^.X:= Gear^.X + SignAs(_1, Gear^.dX);
 SetAllHHToActive;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y + _1;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y + _1;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y + _1;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y + _1;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y + _1;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y + _1;
 if TestCollisionYwithGear(Gear, 1) = 0 then
 begin
 Gear^.Y:= Gear^.Y - _6;
 Gear^.dY:= _0;
 Gear^.State:= Gear^.State or gstMoving;
 exit
 end;
 end
 end
 end
 end
 end
 end;
 AddGearCI(Gear)
 end
 end;
 procedure HedgehogChAngle(HHGear: PGear);
 var da: LongWord;
 begin
 with HHGear^.Hedgehog^ do
-if ((CurAmmoType = amRope) and
+if ((CurAmmoType = amRope) and ((HHGear^.State and (gstMoving or gstHHJumping)) = gstMoving))
-((HHGear^.State and (gstMoving or gstHHJumping)) = gstMoving)) or
+or ((CurAmmoType = amPortalGun) and ((HHGear^.State and gstMoving) <> 0)) then
-((CurAmmoType = amPortalGun) and
+da:= 2
-((HHGear^.State and gstMoving) <> 0)) then da:= 2
 else da:= 1;
 if (((HHGear^.Message and gmPrecise) = 0) or ((GameTicks mod 5) = 1)) then
-if ((HHGear^.Message and gmUp) <> 0) and (HHGear^.Angle >= CurMinAngle + da) then dec(HHGear^.Angle, da)
+if ((HHGear^.Message and gmUp) <> 0) and (HHGear^.Angle >= CurMinAngle + da) then
+dec(HHGear^.Angle, da)
 else
-if ((HHGear^.Message and gmDown) <> 0) and (HHGear^.Angle + da <= CurMaxAngle) then inc(HHGear^.Angle, da)
+if ((HHGear^.Message and gmDown) <> 0) and (HHGear^.Angle + da <= CurMaxAngle) then
+inc(HHGear^.Angle, da)
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepHedgehogMoving(Gear: PGear);
 var isFalling, isUnderwater: boolean;
 land: Word;
 begin
 land:= 0;
 isUnderwater:= cWaterLine < hwRound(Gear^.Y) + Gear^.Radius;
-if Gear^.dX.QWordValue > 8160437862 then Gear^.dX.QWordValue:= 8160437862;
+if Gear^.dX.QWordValue > 8160437862 then
-if Gear^.dY.QWordValue > 8160437862 then Gear^.dY.QWordValue:= 8160437862;
+Gear^.dX.QWordValue:= 8160437862;
+if Gear^.dY.QWordValue > 8160437862 then
+Gear^.dY.QWordValue:= 8160437862;
 if Gear^.Hedgehog^.Unplaced then
 begin
 Gear^.dY:= _0;
 Gear^.dX:= _0;
 Gear^.State:= Gear^.State and (not gstMoving);
 exit
 end;
 isFalling:= (Gear^.dY.isNegative) or not TestCollisionYKick(Gear, 1);
 if isFalling then
 begin
-if (Gear^.dY.isNegative) and TestCollisionYKick(Gear, -1) then Gear^.dY:= _0;
+if (Gear^.dY.isNegative) and TestCollisionYKick(Gear, -1) then
-Gear^.State:= Gear^.State or gstMoving;
+Gear^.dY:= _0;
-if (CurrentHedgehog^.Gear = Gear)
+Gear^.State:= Gear^.State or gstMoving;
+if (CurrentHedgehog^.Gear = Gear)
 and (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > _0_003) then
 begin
 FollowGear:= Gear;
 end;
-if isUnderwater then Gear^.dY:= Gear^.dY + cGravity / _2
+if isUnderwater then
-else
+Gear^.dY:= Gear^.dY + cGravity / _2
-begin
+else
-Gear^.dY:= Gear^.dY + cGravity;
+begin
+Gear^.dY:= Gear^.dY + cGravity;
 // this set of circumstances could be less complex if jumping was more clearly identified
-if ((GameFlags and gfMoreWind) <> 0) and
+if ((GameFlags and gfMoreWind) <> 0) and (((Gear^.Damage <> 0)
-(((Gear^.Damage <> 0) or
+or ((CurAmmoGear <> nil) and ((CurAmmoGear^.AmmoType = amJetpack) or (CurAmmoGear^.AmmoType = amBirdy)))
-((CurAmmoGear <> nil) and
+or ((Gear^.dY.QWordValue + Gear^.dX.QWordValue) > _0_55.QWordValue))) then
-((CurAmmoGear^.AmmoType = amJetpack) or
+Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density
-(CurAmmoGear^.AmmoType = amBirdy))) or
+end
-((Gear^.dY.QWordValue + Gear^.dX.QWordValue) > _0_55.QWordValue)))
+end
-then Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density
-end
-end
 else
 begin
 land:= TestCollisionYwithGear(Gear, 1);
 if ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) < _0_55.QWordValue) and ((land and lfIce) = 0)
-and ((Gear^.State and gstHHJumping) <> 0) then SetLittle(Gear^.dX);
+and ((Gear^.State and gstHHJumping) <> 0) then
+SetLittle(Gear^.dX);
-if not Gear^.dY.isNegative then
-begin
+if not Gear^.dY.isNegative then
-CheckHHDamage(Gear);
+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
+if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery)
+and (Gear^.dX.QWordValue < _0_02.QWordValue) then
-Gear^.State:= Gear^.State and (not (gstHHJumping or gstHHHJump));
+Gear^.dX.isNegative:= not Gear^.dX.isNegative; // landing after high jump
-Gear^.dY:= _0;
+Gear^.State:= Gear^.State and (not (gstHHJumping or gstHHHJump));
-end else Gear^.dY:= Gear^.dY + cGravity;
+Gear^.dY:= _0;
+end
-if ((Gear^.State and gstMoving) <> 0) then
+else
-begin
+Gear^.dY:= Gear^.dY + cGravity;
-if land and lfIce <> 0 then
-begin
+if ((Gear^.State and gstMoving) <> 0) then
-Gear^.dX:= Gear^.dX * (_1 - (_1 - Gear^.Friction) / _2)
+begin
-end
+if land and lfIce <> 0 then
-else Gear^.dX:= Gear^.dX * Gear^.Friction;
+begin
-end
+Gear^.dX:= Gear^.dX * (_1 - (_1 - Gear^.Friction) / _2)
-end;
+end
+else
-if (Gear^.State <> 0) then DeleteCI(Gear);
+Gear^.dX:= Gear^.dX * Gear^.Friction;
+end
+end;
+if (Gear^.State <> 0) then
+DeleteCI(Gear);
 if isUnderwater then
 begin
 Gear^.dY:= Gear^.dY * _0_999;
 Gear^.dX:= Gear^.dX * _0_999;
 end;
 if (Gear^.State and gstMoving) <> 0 then
 if TestCollisionXKick(Gear, hwSign(Gear^.dX)) then
 if not isFalling then
 if hwAbs(Gear^.dX) > _0_01 then
-if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -1, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_96; Gear^.Y:= Gear^.Y - _1 end else
+if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -1, hwSign(Gear^.dX)) then
-if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -2, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_93; Gear^.Y:= Gear^.Y - _2 end else
+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
+Gear^.X:= Gear^.X + Gear^.dX;
-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
+Gear^.dX:= Gear^.dX * _0_96;
-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
+Gear^.Y:= Gear^.Y - _1
-if hwAbs(Gear^.dX) > _0_02 then Gear^.dX:= -Gear^.Elasticity * Gear^.dX
+end
-else begin
+else
-Gear^.State:= Gear^.State and (not gstMoving);
+if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -2, hwSign(Gear^.dX)) then
-while TestCollisionYWithGear(Gear,1) = 0 do Gear^.Y:= Gear^.Y+_1;
+begin
-SetLittle(Gear^.dX)
+Gear^.X:= Gear^.X + Gear^.dX;
-end
+Gear^.dX:= Gear^.dX * _0_93;
-else begin
+Gear^.Y:= Gear^.Y - _2
-Gear^.State:= Gear^.State and (not gstMoving);
+end
-while TestCollisionYWithGear(Gear,1) = 0 do Gear^.Y:= Gear^.Y+_1;
+else
-SetLittle(Gear^.dX)
+if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -3, hwSign(Gear^.dX)) then
-end
+begin
-else if (hwAbs(Gear^.dX) > cLittle)
+Gear^.X:= Gear^.X + Gear^.dX;
-and ((Gear^.State and gstHHJumping) = 0)
+Gear^.dX:= Gear^.dX * _0_9 ;
-then Gear^.dX:= -Gear^.Elasticity * Gear^.dX
+Gear^.Y:= Gear^.Y - _3
-else SetLittle(Gear^.dX);
+end
+else
-if (not isFalling) and
+if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -4, hwSign(Gear^.dX)) then
-(hwAbs(Gear^.dX) + hwAbs(Gear^.dY) < _0_03) then
+begin
-begin
+Gear^.X:= Gear^.X + Gear^.dX;
-Gear^.State:= Gear^.State and (not gstWinner);
+Gear^.dX:= Gear^.dX * _0_87;
-Gear^.State:= Gear^.State and (not gstMoving);
+Gear^.Y:= Gear^.Y - _4
-while TestCollisionYWithGear(Gear,1) = 0 do Gear^.Y:= Gear^.Y+_1;
+end
-SetLittle(Gear^.dX);
+else
-Gear^.dY:= _0
+if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -5, hwSign(Gear^.dX)) then
-end else Gear^.State:= Gear^.State or gstMoving;
+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);
+while TestCollisionYWithGear(Gear,1) = 0 do
+Gear^.Y:= Gear^.Y+_1;
+SetLittle(Gear^.dX)
+end
+else
+begin
+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) then
+Gear^.dX:= -Gear^.Elasticity * Gear^.dX
+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 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);
 // 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
+if (not Gear^.dY.isNegative) and (not TestCollisionYKick(Gear, 1))
-(not TestCollisionYKick(Gear, 1)) and
+and TestCollisionYwithXYShift(Gear, 0, 1, 1) then
-TestCollisionYwithXYShift(Gear, 0, 1, 1) then
+begin
-begin
+CheckHHDamage(Gear);
-CheckHHDamage(Gear);
+Gear^.dY:= _0;
-Gear^.dY:= _0;
+Gear^.Y:= Gear^.Y + _1
-Gear^.Y:= Gear^.Y + _1
+end;
-end;
+CheckGearDrowning(Gear);
-CheckGearDrowning(Gear);
+// hide target cursor if current hog is drowning
-// hide target cursor if current hog is drowning
+if (Gear^.State and gstDrowning) <> 0 then
-if (Gear^.State and gstDrowning) <> 0 then
+if (CurrentHedgehog^.Gear = Gear) then
-if (CurrentHedgehog^.Gear = Gear) then
+isCursorVisible:= false
-isCursorVisible:= false
+end;
-end;
 if (hwAbs(Gear^.dY) > _0) and (Gear^.FlightTime > 0) and ((GameFlags and gfLowGravity) = 0) then
 begin
 inc(Gear^.FlightTime);
 if Gear^.FlightTime = 3000 then
 wasJumping: boolean;
 Hedgehog: PHedgehog;
 begin
 Hedgehog:= HHGear^.Hedgehog;
 if isInMultiShoot then
 HHGear^.Message:= 0;
 if ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_Utility) <> 0) and isInMultiShoot then
 AllInactive:= true
-else if not isInMultiShoot then AllInactive:= false;
+else if not isInMultiShoot then
+AllInactive:= false;
 if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) then
 begin
-if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
+if TagTurnTimeLeft = 0 then
+TagTurnTimeLeft:= TurnTimeLeft;
 TurnTimeLeft:= 0;
 isCursorVisible:= false;
 HHGear^.State:= HHGear^.State and (not (gstHHDriven or gstAnimation or gstAttacking));
 AttackBar:= 0;
 if HHGear^.Damage > 0 then
 end;
 if (HHGear^.State and gstAnimation) <> 0 then
 begin
 HHGear^.Message:= 0;
-if (HHGear^.Pos = Wavez[TWave(HHGear^.Tag)].VoiceDelay) and (HHGear^.Timer = 0) then PlaySound(Wavez[TWave(HHGear^.Tag)].Voice, Hedgehog^.Team^.voicepack);
+if (HHGear^.Pos = Wavez[TWave(HHGear^.Tag)].VoiceDelay) and (HHGear^.Timer = 0) then
+PlaySound(Wavez[TWave(HHGear^.Tag)].Voice, Hedgehog^.Team^.voicepack);
 inc(HHGear^.Timer);
 if HHGear^.Timer = Wavez[TWave(HHGear^.Tag)].Interval then
 begin
 HHGear^.Timer:= 0;
 inc(HHGear^.Pos);
 end;
 exit
 end;
 if ((HHGear^.State and gstMoving) <> 0)
 or (StepTicks = cHHStepTicks)
 or (CurAmmoGear <> nil) then // we are moving
 begin
 with Hedgehog^ do
 if (CurAmmoGear = nil)
 and (HHGear^.dY > _0_39)
-and (CurAmmoType = amParachute) then HHGear^.Message:= HHGear^.Message or gmAttack;
+and (CurAmmoType = amParachute) then
+HHGear^.Message:= HHGear^.Message or gmAttack;
 // check for case with ammo
 t:= CheckGearNear(HHGear, gtCase, 36, 36);
 if t <> nil then
 PickUp(HHGear, t)
 end;
 if (CurAmmoGear = nil) then
 if (((HHGear^.Message and gmAttack) <> 0)
 or ((HHGear^.State and gstAttacking) <> 0)) then
 Attack(HHGear) // should be before others to avoid desync with '/put' msg and changing weapon msgs
 else
 else
 with Hedgehog^ do
 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)
 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
 begin
 if ((HHGear^.Message and gmSlot) <> 0) then
 if ChangeAmmo(HHGear) then ApplyAmmoChanges(Hedgehog^);
-if ((HHGear^.Message and gmWeapon) <> 0) then HHSetWeapon(HHGear);
+if ((HHGear^.Message and gmWeapon) <> 0) then
+HHSetWeapon(HHGear);
-if ((HHGear^.Message and gmTimer) <> 0) then HHSetTimer(HHGear);
+if ((HHGear^.Message and gmTimer) <> 0) then
+HHSetTimer(HHGear);
 end;
 if CurAmmoGear <> nil then
 begin
 CurAmmoGear^.Message:= HHGear^.Message;
 exit
 end;
 if not isInMultiShoot then
 HedgehogChAngle(HHGear);
 if (HHGear^.State and gstMoving) <> 0 then
 begin
 wasJumping:= ((HHGear^.State and gstHHJumping) <> 0);
-if ((HHGear^.Message and gmHJump) <> 0) and
+if ((HHGear^.Message and gmHJump) <> 0) and wasJumping and ((HHGear^.State and gstHHHJump) = 0) then
-wasJumping and
-((HHGear^.State and gstHHHJump) = 0) then
 if (not (hwAbs(HHGear^.dX) > cLittle)) and (HHGear^.dY < -_0_02) then
 begin
 HHGear^.State:= HHGear^.State or gstHHHJump;
 HHGear^.dY:= -_0_25;
-if not cArtillery then HHGear^.dX:= -SignAs(_0_02, HHGear^.dX);
+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));
-if (not cArtillery) and wasJumping and
+if (not cArtillery) and wasJumping and TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then
-TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then SetLittle(HHGear^.dX);
+SetLittle(HHGear^.dX);
-if Hedgehog^.Gear <> nil then doStepHedgehogMoving(HHGear);
+if Hedgehog^.Gear <> nil then
+doStepHedgehogMoving(HHGear);
 if ((HHGear^.State and (gstMoving or gstDrowning)) = 0) then
 begin
 AddGearCI(HHGear);
 if wasJumping then
 exit
 end;
 if not isInMultiShoot and (Hedgehog^.Gear <> nil) then
 begin
-if StepTicks > 0 then dec(StepTicks);
+if StepTicks > 0 then
-if (StepTicks = 0) then HedgehogStep(HHGear)
+dec(StepTicks);
+if (StepTicks = 0) then
+HedgehogStep(HHGear)
 end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepHedgehogFree(Gear: PGear);
 doStepHedgehogMoving(Gear);
 if (Gear^.State and (gstMoving or gstDrowning)) <> 0 then
 begin
-if Gear^.Damage > 0 then CalcRotationDirAngle(Gear);
+if Gear^.Damage > 0 then
+CalcRotationDirAngle(Gear);
 AllInactive:= false;
 exit
 end;
 if (Gear^.Health = 0) then
 AllInactive:= false;
 if (Gear^.State and gstHHGone) = 0 then
 begin
 Gear^.Hedgehog^.Effects[hePoisoned] := false;
-if Gear^.Hedgehog^.Effects[heResurrectable] then begin
+if Gear^.Hedgehog^.Effects[heResurrectable] then
+begin
 ResurrectHedgehog(Gear);
-end else
+end
+else
 begin
 Gear^.State:= (Gear^.State or gstHHDeath) and (not gstAnimation);
 Gear^.doStep:= @doStepHedgehogDead;
 // Death message
 AddCaption(Format(GetEventString(eidDied), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage);
 if ((Gear^.State and gstWait) = 0) and
 (prevState <> Gear^.State) then
 begin
 Gear^.State:= Gear^.State or gstWait;
 Gear^.Timer:= 150
-end else
+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^.Active:= false;
 AddGearCI(Gear);
 exit
-end else dec(Gear^.Timer)
+end
+else dec(Gear^.Timer)
 end;
 AllInactive:= false
 end;
 if Team^.hasGone then
 TeamGoneEffect(Team^)
 else
 doStepHedgehogDriven(Gear)
 end;
-if (Gear^.Message and (gmAllStoppable or gmLJump or gmHJump) = 0) and
+if (Gear^.Message and (gmAllStoppable or gmLJump or gmHJump) = 0)
-(Gear^.State and (gstHHJumping or gstHHHJump or gstAttacking) = 0) and
+and (Gear^.State and (gstHHJumping or gstHHHJump or gstAttacking) = 0)
-(not Gear^.dY.isNegative) and
+and (not Gear^.dY.isNegative) and (GameTicks mod (100*LongWOrd(hwRound(cMaxWindSpeed*2/cGravity))) = 0)
-(GameTicks mod (100*LongWOrd(hwRound(cMaxWindSpeed*2/cGravity))) = 0) and
+and (TestCollisionYwithGear(Gear, 1) and lfIce <> 0) then
-(TestCollisionYwithGear(Gear, 1) and lfIce <> 0) then
 begin
 slope:= CalcSlopeBelowGear(Gear);
 Gear^.dX:=Gear^.dX+slope*_0_07;
-if slope.QWordValue <> 0 then Gear^.State:= Gear^.State or gstMoving;
+if slope.QWordValue <> 0 then
+Gear^.State:= Gear^.State or gstMoving;
 (*
 x:= hwRound(Gear^.X);
 y:= hwRound(Gear^.Y);
 AddVisualGear(x, y, vgtSmokeTrace);
 AddVisualGear(x - hwRound(_5*slope), y + hwRound(_5*slope), vgtSmokeTrace);

changeset 6580	6155187bf599
parent 6543	697e9b730189
child 6581	e510d1245bd7