hedgewars: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:fc52f7c22c9b
+:6155187bf599
 procedure doStepDrowningGear(Gear: PGear);
 implementation
 uses uStore, uSound, uTeams, uRandom, uCollisions, uIO, uLandGraphics,
 uAIMisc, uLocale, uAI, uAmmos, uStats, uVisualGears, uScript, GLunit, uMobile, uVariables,
 uCommands, uUtils, uTextures, uRenderUtils, uGearsRender, uCaptions, uDebug, uLandTexture,
 uGearsHedgehog, uGearsUtils, uGearsList;
 procedure AmmoShove(Ammo: PGear; Damage, Power: LongInt); forward;
 //procedure AmmoFlameWork(Ammo: PGear); forward;
 function  GearsNear(X, Y: hwFloat; Kind: TGearType; r: LongInt): TPGearArray; forward;
 begin
 CheckNoDamage:= true;
 Gear:= GearsList;
 while Gear <> nil do
 begin
-if (Gear^.Kind = gtHedgehog) and (((GameFlags and gfInfAttack) = 0) or ((Gear^.dX.QWordValue < _0_000004.QWordValue) and (Gear^.dY.QWordValue < _0_000004.QWordValue))) then
+if (Gear^.Kind = gtHedgehog) and (((GameFlags and gfInfAttack) = 0) or ((Gear^.dX.QWordValue < _0_000004.QWordValue)
-begin
+and (Gear^.dY.QWordValue < _0_000004.QWordValue))) then
-if (not isInMultiShoot) then inc(Gear^.Damage, Gear^.Karma);
+begin
-if (Gear^.Damage <> 0) and
+if (not isInMultiShoot) then
-(not Gear^.Invulnerable) then
+inc(Gear^.Damage, Gear^.Karma);
+if (Gear^.Damage <> 0) and (not Gear^.Invulnerable) then
 begin
 CheckNoDamage:= false;
 dmg:= Gear^.Damage;
 if Gear^.Health < dmg then
 Gear^.Health:= 0
 end
 else
 dec(Gear^.Health, dmg);
-if (Gear^.Hedgehog^.Team = CurrentTeam) and
+if (Gear^.Hedgehog^.Team = CurrentTeam) and (Gear^.Damage <> Gear^.Karma)
-(Gear^.Damage <> Gear^.Karma) and
+and (not Gear^.Hedgehog^.King) and (not Gear^.Hedgehog^.Effects[hePoisoned]) and (not SuddenDeathDmg) then
-(not Gear^.Hedgehog^.King) and
-(not Gear^.Hedgehog^.Effects[hePoisoned]) and
-(not SuddenDeathDmg) then
 Gear^.State:= Gear^.State or gstLoser;
 spawnHealthTagForHH(Gear, dmg);
 RenderHealth(Gear^.Hedgehog^);
 RecountTeamHealth(Gear^.Hedgehog^.Team);
 end;
-if (not isInMultiShoot) then Gear^.Karma:= 0;
+if (not isInMultiShoot) then
+Gear^.Karma:= 0;
 Gear^.Damage:= 0
 end;
 Gear:= Gear^.NextGear
 end;
 end;
 procedure HealthMachine;
 var Gear: PGear;
 team: PTeam;
 i: LongWord;
 flag: Boolean;
 tmp: LongWord;
 begin
 Gear:= GearsList;
 while Gear <> nil do
 begin
 begin
 tmp:= 0;
 if Gear^.Hedgehog^.Effects[hePoisoned] then
 begin
 inc(tmp, ModifyDamage(5, Gear));
-if (GameFlags and gfResetHealth) <> 0 then dec(Gear^.Hedgehog^.InitialHealth)  // does not need a minimum check since <= 1 basically disables it
+if (GameFlags and gfResetHealth) <> 0 then
+dec(Gear^.Hedgehog^.InitialHealth)  // does not need a minimum check since <= 1 basically disables it
 end;
 if (TotalRounds > cSuddenDTurns - 1) then
 begin
 inc(tmp, cHealthDecrease);
-if (GameFlags and gfResetHealth) <> 0 then dec(Gear^.Hedgehog^.InitialHealth, cHealthDecrease)
+if (GameFlags and gfResetHealth) <> 0 then
+dec(Gear^.Hedgehog^.InitialHealth, cHealthDecrease)
 end;
 if Gear^.Hedgehog^.King then
 begin
 flag:= false;
 team:= Gear^.Hedgehog^.Team;
 for i:= 0 to Pred(team^.HedgehogsNumber) do
-if (team^.Hedgehogs[i].Gear <> nil) and
+if (team^.Hedgehogs[i].Gear <> nil) and (not team^.Hedgehogs[i].King)
-(not team^.Hedgehogs[i].King) and
+and (team^.Hedgehogs[i].Gear^.Health > team^.Hedgehogs[i].Gear^.Damage) then
-(team^.Hedgehogs[i].Gear^.Health > team^.Hedgehogs[i].Gear^.Damage)
+flag:= true;
-then flag:= true;
 if not flag then
 begin
 inc(tmp, 5);
-if (GameFlags and gfResetHealth) <> 0 then dec(Gear^.Hedgehog^.InitialHealth, 5)
+if (GameFlags and gfResetHealth) <> 0 then
+dec(Gear^.Hedgehog^.InitialHealth, 5)
 end
 end;
 if tmp > 0 then
 begin
 inc(Gear^.Damage, min(tmp, max(0,Gear^.Health - 1 - Gear^.Damage)));
 end;
 end;
 procedure ProcessGears;
 const delay: LongWord = 0;
 delay2: LongWord = 0;
 step: (stDelay, stChDmg, stSweep, stTurnReact,
 stAfterDelay, stChWin, stWater, stChWin2, stHealth,
 stSpawn, stNTurn) = stDelay;
 var Gear, t: PGear;
 i, AliveCount: LongInt;
 s: shortstring;
 begin
 PrvInactive:= AllInactive;
 end
 end;
 if AllInactive then
 case step of
-stDelay: begin
+stDelay:
+begin
 if delay = 0 then
 delay:= cInactDelay
 else
 dec(delay);
 if delay = 0 then
 inc(step)
 end;
-stChDmg: if CheckNoDamage then inc(step) else step:= stDelay;
-stSweep: if SweepDirty then
+stChDmg:
-begin
+if CheckNoDamage then
-SetAllToActive;
+inc(step)
-step:= stChDmg
+else
-end else inc(step);
+step:= stDelay;
-stTurnReact: begin
+stSweep:
+if SweepDirty then
+begin
+SetAllToActive;
+step:= stChDmg
+end
+else
+inc(step);
+stTurnReact:
+begin
 if (not bBetweenTurns) and (not isInMultiShoot) then
 begin
 uStats.TurnReaction;
 inc(step)
-end else
+end
+else
 inc(step, 2);
 end;
-stAfterDelay: begin
+stAfterDelay:
+begin
 if delay = 0 then
 delay:= cInactDelay
 else
 dec(delay);
 if delay = 0 then
+inc(step)
+end;
+stChWin:
+begin
+CheckForWin;
 inc(step)
 end;
-stChWin: begin
+stWater:
-CheckForWin;
+if (not bBetweenTurns) and (not isInMultiShoot) then
-inc(step)
+begin
-end;
+if TotalRounds = cSuddenDTurns + 1 then
-stWater: if (not bBetweenTurns) and (not isInMultiShoot) then
+bWaterRising:= true;
-begin
+if bWaterRising and (cWaterRise > 0) then
-if TotalRounds = cSuddenDTurns + 1 then bWaterRising:= true;
+AddGear(0, 0, gtWaterUp, 0, _0, _0, 0)^.Tag:= cWaterRise;
+inc(step)
-if bWaterRising and (cWaterRise > 0) then
+end
-AddGear(0, 0, gtWaterUp, 0, _0, _0, 0)^.Tag:= cWaterRise;
+else
+inc(step);
-inc(step)
+stChWin2:
-end else inc(step);
+begin
-stChWin2: begin
+CheckForWin;
-CheckForWin;
+inc(step)
-inc(step)
+end;
-end;
-stHealth: begin
+stHealth:
-if (cWaterRise <> 0) or (cHealthDecrease <> 0) then
+begin
-begin
+if (cWaterRise <> 0) or (cHealthDecrease <> 0) then
-if (TotalRounds = cSuddenDTurns) and (not SuddenDeath) and (not isInMultiShoot) then
+begin
+if (TotalRounds = cSuddenDTurns) and (not SuddenDeath) and (not isInMultiShoot) then
+begin
+SuddenDeath:= true;
+if cHealthDecrease <> 0 then
 begin
-SuddenDeath:= true;
+SuddenDeathDmg:= true;
-if cHealthDecrease <> 0 then
-begin
-SuddenDeathDmg:= true;
 // flash
 ScreenFade:= sfFromWhite;
 ScreenFadeValue:= sfMax;
 ScreenFadeSpeed:= 1;
 ChangeToSDClouds;
 ChangeToSDFlakes;
 glClearColor(SDSkyColor.r * (SDTint/255) / 255, SDSkyColor.g * (SDTint/255) / 255, SDSkyColor.b * (SDTint/255) / 255, 0.99);
 Ammoz[amTardis].SkipTurns:= 9999;
 Ammoz[amTardis].Probability:= 0;
 end;
 AddCaption(trmsg[sidSuddenDeath], cWhiteColor, capgrpGameState);
 playSound(sndSuddenDeath);
 StopMusic //No SDMusic for now
 //MusicFN:= SDMusic;
 //ChangeMusic
 end
 else if (TotalRounds < cSuddenDTurns) and (not isInMultiShoot) then
 begin
 else if (i = 2) or ((i > 0) and ((i mod 50 = 0) or ((i <= 25) and (i mod 5 = 0)))) then
 AddCaption(Format(trmsg[sidRoundsSD], s), cWhiteColor, capgrpGameState);
 end;
 end;
 if bBetweenTurns
 or isInMultiShoot
-or (TotalRounds = -1) then inc(step)
+or (TotalRounds = -1) then
-else begin
+inc(step)
+else
+begin
 bBetweenTurns:= true;
 HealthMachine;
 step:= stChDmg
 end
 end;
-stSpawn: begin
+stSpawn:
-if not isInMultiShoot then SpawnBoxOfSmth;
+begin
-inc(step)
+if not isInMultiShoot then
-end;
+SpawnBoxOfSmth;
-stNTurn: begin
+inc(step)
-if isInMultiShoot then
+end;
-isInMultiShoot:= false
+stNTurn:
-else begin
+begin
-// delayed till after 0.9.12
+if isInMultiShoot then
-// reset to default zoom
+isInMultiShoot:= false
-//ZoomValue:= ZoomDefault;
+else
-with CurrentHedgehog^ do
+begin
-if (Gear <> nil)
+// delayed till after 0.9.12
-and ((Gear^.State and gstAttacked) = 0)
+// reset to default zoom
-and (MultiShootAttacks > 0) then OnUsedAmmo(CurrentHedgehog^);
+//ZoomValue:= ZoomDefault;
+with CurrentHedgehog^ do
+if (Gear <> nil)
+and ((Gear^.State and gstAttacked) = 0)
+and (MultiShootAttacks > 0) then
+OnUsedAmmo(CurrentHedgehog^);
 EndTurnCleanup;
 FreeActionsList; // could send -left, -right and similar commands, so should be called before /nextturn
 delay2:= cInactDelay * 50
 else
 begin
 dec(delay2);
-if ((delay2 mod cInactDelay) = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and (not CurrentHedgehog^.Unplaced) then
+if ((delay2 mod cInactDelay) = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil)
-begin
+and (not CurrentHedgehog^.Unplaced) then
-if (CurrentHedgehog^.Gear^.State and gstAttacked <> 0) and (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0) then
+begin
+if (CurrentHedgehog^.Gear^.State and gstAttacked <> 0)
+and (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0) then
 begin
 CurrentHedgehog^.Gear^.State:= CurrentHedgehog^.Gear^.State or gstHHChooseTarget;
 isCursorVisible := true
 end;
 CurrentHedgehog^.Gear^.State:= CurrentHedgehog^.Gear^.State and (not gstAttacked);
 end;
 if delay2 = 0 then
 begin
-if (CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.State and gstAttacked = 0) and (CurAmmoGear = nil) then SweepDirty;
+if (CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.State and gstAttacked = 0)
+and (CurAmmoGear = nil) then
+SweepDirty;
 CheckNoDamage;
 AliveCount:= 0; // shorter version of check for win to allow typical step activity to proceed
 for i:= 0 to Pred(ClansCount) do
-if ClansArray[i]^.ClanHealth > 0 then inc(AliveCount);
+if ClansArray[i]^.ClanHealth > 0 then
+inc(AliveCount);
 if (AliveCount <= 1) and ((GameFlags and gfOneClanMode) = 0) then
 begin
 step:= stChDmg;
-if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
+if TagTurnTimeLeft = 0 then
+TagTurnTimeLeft:= TurnTimeLeft;
 TurnTimeLeft:= 0
 end
 end
 end
 end;
 if TurnTimeLeft > 0 then
 if CurrentHedgehog^.Gear <> nil then
 if ((CurrentHedgehog^.Gear^.State and gstAttacking) = 0)
 and (not isInMultiShoot) then
 begin
 if (TurnTimeLeft = 5000)
 and (cHedgehogTurnTime >= 10000)
 and (not PlacingHogs)
 and (CurrentHedgehog^.Gear <> nil)
 and ((CurrentHedgehog^.Gear^.State and gstAttacked) = 0) then
 AddVoice(sndHurry, CurrentTeam^.voicepack);
 if ReadyTimeLeft > 0 then
 begin
 if ReadyTimeLeft = 2000 then
 AddVoice(sndComeonthen, CurrentTeam^.voicepack);
 dec(ReadyTimeLeft)
 end
 else
 dec(TurnTimeLeft)
 end;
 if skipFlag then
 begin
-if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
+if TagTurnTimeLeft = 0 then
+TagTurnTimeLeft:= TurnTimeLeft;
 TurnTimeLeft:= 0;
 skipFlag:= false;
 inc(CurrentHedgehog^.Team^.stats.TurnSkips);
 end;
 begin
 AllInactive:= false;
 t:= GearsList;
 while t <> nil do
 begin
-if (t^.Kind = gtHedgehog) or (t^.Kind = gtExplosives) then t^.Active:= true;
+if (t^.Kind = gtHedgehog) or (t^.Kind = gtExplosives) then
+t^.Active:= true;
 t:= t^.NextGear
 end
 end;
 if (GameFlags and gfVampiric) <> 0 then
 cVampiric:= true;
 Gear:= GearsList;
 if (GameFlags and gfInvulnerable) <> 0 then
 while Gear <> nil do
 begin
 Gear^.Invulnerable:= true;  // this is only checked on hogs right now, so no need for gear type check
 Gear:= Gear^.NextGear
 end;
 if (GameFlags and gfLaserSight) <> 0 then
 cLaserSighting:= true;
 if (GameFlags and gfArtillery) <> 0 then
 end
 end;
 end;
 t:= t^.NextGear
 end;
-if (GameFlags and gfSolidLand) = 0 then DrawExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), cShotgunRadius)
+if (GameFlags and gfSolidLand) = 0 then
+DrawExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), cShotgunRadius)
 end;
 procedure AmmoShove(Ammo: PGear; Damage, Power: LongInt);
 var t: PGearArray;
 Gear: PGear;
 i, tmpDmg: LongInt;
 VGear: PVisualGear;
 begin
 t:= CheckGearsCollision(Ammo);
 // Just to avoid hogs on rope dodging fire.
-if (CurAmmoGear <> nil) and ((CurAmmoGear^.Kind = gtRope) or (CurAmmoGear^.Kind = gtJetpack) or (CurAmmoGear^.Kind = gtBirdy)) and
+if (CurAmmoGear <> nil) and ((CurAmmoGear^.Kind = gtRope) or (CurAmmoGear^.Kind = gtJetpack) or (CurAmmoGear^.Kind = gtBirdy))
-(CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.CollisionIndex = -1) and
+and (CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.CollisionIndex = -1)
-(sqr(hwRound(Ammo^.X) - hwRound(CurrentHedgehog^.Gear^.X)) + sqr(hwRound(Ammo^.Y) - hwRound(CurrentHedgehog^.Gear^.Y)) <= sqr(cHHRadius + Ammo^.Radius)) then
+and (sqr(hwRound(Ammo^.X) - hwRound(CurrentHedgehog^.Gear^.X)) + sqr(hwRound(Ammo^.Y) - hwRound(CurrentHedgehog^.Gear^.Y)) <= sqr(cHHRadius + Ammo^.Radius)) then
 begin
 t^.ar[t^.Count]:= CurrentHedgehog^.Gear;
 inc(t^.Count)
 end;
 i:= t^.Count;
-if (Ammo^.Kind = gtFlame) and (i > 0) then Ammo^.Health:= 0;
+if (Ammo^.Kind = gtFlame) and (i > 0) then
+Ammo^.Health:= 0;
 while i > 0 do
 begin
 dec(i);
 Gear:= t^.ar[i];
 tmpDmg:= ModifyDamage(Damage, Gear);
 begin
 if (Ammo^.Kind = gtDEagleShot) or (Ammo^.Kind = gtSniperRifleShot) then
 begin
 VGear := AddVisualGear(hwround(Ammo^.X), hwround(Ammo^.Y), vgtBulletHit);
-if VGear <> nil then VGear^.Angle := DxDy2Angle(-Ammo^.dX, Ammo^.dY);
+if VGear <> nil then
-end;
+VGear^.Angle := DxDy2Angle(-Ammo^.dX, Ammo^.dY);
+end;
-if (Gear^.Kind = gtHedgehog) and (Ammo^.State and gsttmpFlag <> 0) and (Ammo^.Kind = gtShover) then Gear^.FlightTime:= 1;
+if (Gear^.Kind = gtHedgehog) and (Ammo^.State and gsttmpFlag <> 0) and (Ammo^.Kind = gtShover) then
+Gear^.FlightTime:= 1;
 case Gear^.Kind of
 gtHedgehog,
 gtMine,
 gtSMine,
 gtTarget,
 gtCase,
 gtExplosives,
-gtStructure: begin
+gtStructure:
-if (Ammo^.Kind = gtDrill) then begin Ammo^.Timer:= 0; exit; end;
+begin
-if (not Gear^.Invulnerable) then
+if (Ammo^.Kind = gtDrill) then
-ApplyDamage(Gear, Ammo^.Hedgehog, tmpDmg, dsShove)
+begin
-else
+Ammo^.Timer:= 0;
-Gear^.State:= Gear^.State or gstWinner;
+exit;
-if (Gear^.Kind = gtExplosives) and (Ammo^.Kind = gtBlowtorch) then
+end;
-begin
+if (not Gear^.Invulnerable) then
-if (Ammo^.Hedgehog^.Gear <> nil) then Ammo^.Hedgehog^.Gear^.State:= Ammo^.Hedgehog^.Gear^.State and (not gstNotKickable);
+ApplyDamage(Gear, Ammo^.Hedgehog, tmpDmg, dsShove)
-ApplyDamage(Gear, Ammo^.Hedgehog, tmpDmg * 100, dsUnknown); // crank up damage for explosives + blowtorch
+else
-end;
+Gear^.State:= Gear^.State or gstWinner;
+if (Gear^.Kind = gtExplosives) and (Ammo^.Kind = gtBlowtorch) then
-DeleteCI(Gear);
+begin
-if (Gear^.Kind = gtHedgehog) and Gear^.Hedgehog^.King then
+if (Ammo^.Hedgehog^.Gear <> nil) then
-begin
+Ammo^.Hedgehog^.Gear^.State:= Ammo^.Hedgehog^.Gear^.State and (not gstNotKickable);
-Gear^.dX:= Ammo^.dX * Power * _0_005;
+ApplyDamage(Gear, Ammo^.Hedgehog, tmpDmg * 100, dsUnknown); // crank up damage for explosives + blowtorch
-Gear^.dY:= Ammo^.dY * Power * _0_005
+end;
-end
-else
+DeleteCI(Gear);
-begin
+if (Gear^.Kind = gtHedgehog) and Gear^.Hedgehog^.King then
-Gear^.dX:= Ammo^.dX * Power * _0_01;
+begin
-Gear^.dY:= Ammo^.dY * Power * _0_01
+Gear^.dX:= Ammo^.dX * Power * _0_005;
-end;
+Gear^.dY:= Ammo^.dY * Power * _0_005
+end
-Gear^.Active:= true;
+else
-Gear^.State:= Gear^.State or gstMoving;
+begin
+Gear^.dX:= Ammo^.dX * Power * _0_01;
-if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
+Gear^.dY:= Ammo^.dY * Power * _0_01
-begin
+end;
-if not (TestCollisionXwithXYShift(Gear, _0, -3, hwSign(Gear^.dX))
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
+Gear^.Active:= true;
-if not (TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX))
+Gear^.State:= Gear^.State or gstMoving;
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
-if not (TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX))
+if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
-or (TestCollisionYwithGear(Gear, -1) <> 0)) then Gear^.Y:= Gear^.Y - _1;
+begin
-end;
+if not (TestCollisionXwithXYShift(Gear, _0, -3, hwSign(Gear^.dX))
+or (TestCollisionYwithGear(Gear, -1) <> 0)) then
-if (Ammo^.Kind <> gtFlame) or ((Ammo^.State and gsttmpFlag) = 0) then FollowGear:= Gear
+Gear^.Y:= Gear^.Y - _1;
-end;
+if not (TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX))
+or (TestCollisionYwithGear(Gear, -1) <> 0)) then
+Gear^.Y:= Gear^.Y - _1;
+if not (TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX))
+or (TestCollisionYwithGear(Gear, -1) <> 0)) then
+Gear^.Y:= Gear^.Y - _1;
+end;
+if (Ammo^.Kind <> gtFlame) or ((Ammo^.State and gsttmpFlag) = 0) then
+FollowGear:= Gear
+end;
 end
 end;
 end;
-if i <> 0 then SetAllToActive
+if i <> 0 then
+SetAllToActive
 end;
 procedure AssignHHCoords;
 var i, t, p, j: LongInt;
 ar: array[0..Pred(cMaxHHs)] of PHedgehog;
 Count: Longword;
 begin
-if (GameFlags and gfPlaceHog) <> 0 then PlacingHogs:= true;
+if (GameFlags and gfPlaceHog) <> 0 then
+PlacingHogs:= true;
 if (GameFlags and gfDivideTeams) <> 0 then
 begin
 t:= 0;
 TryDo(ClansCount = 2, 'More or less than 2 clans on map in divided teams mode!', true);
 for p:= 0 to 1 do
 with Teams[j]^ do
 for i:= 0 to cMaxHHIndex do
 with Hedgehogs[i] do
 if (Gear <> nil) and (Gear^.X.QWordValue = 0) then
 begin
-if PlacingHogs then Unplaced:= true
+if PlacingHogs then
-else FindPlace(Gear, false, t, t + LAND_WIDTH div 2);// could make Gear == nil;
+Unplaced:= true
+else
+FindPlace(Gear, false, t, t + LAND_WIDTH div 2);// could make Gear == nil;
 if Gear <> nil then
 begin
 Gear^.Pos:= GetRandom(49);
 Gear^.dX.isNegative:= p = 1;
 end
 //it would be nice if divide teams, forts mode and hh per map could all be checked by the team widget, or maybe disable start button
 TryDo(Count <= MaxHedgehogs, 'Too many hedgehogs for this map! (max # is ' + inttostr(MaxHedgehogs) + ')', true);
 while (Count > 0) do
 begin
 i:= GetRandom(Count);
-if PlacingHogs then ar[i]^.Unplaced:= true
+if PlacingHogs then
-else FindPlace(ar[i]^.Gear, false, 0, LAND_WIDTH);
+ar[i]^.Unplaced:= true
+else
+FindPlace(ar[i]^.Gear, false, 0, LAND_WIDTH);
 if ar[i]^.Gear <> nil then
 begin
 ar[i]^.Gear^.dX.isNegative:= hwRound(ar[i]^.Gear^.X) > LAND_WIDTH div 2;
 ar[i]^.Gear^.Pos:= GetRandom(19)
 end;
 begin
 t:= GearsList;
 while t <> nil do
 begin
-if t^.Kind = Kind then inc(count);
+if t^.Kind = Kind then
+inc(count);
 t:= t^.NextGear
 end;
 CountGears:= count;
 end;
 function SpawnCustomCrateAt(x, y: LongInt; crate: TCrateType; content: Longword): PGear;
 begin
 FollowGear := AddGear(x, y, gtCase, 0, _0, _0, 0);
 cCaseFactor := 0;
-if (crate <> HealthCrate) and (content > ord(High(TAmmoType))) then content := ord(High(TAmmoType));
+if (crate <> HealthCrate) and (content > ord(High(TAmmoType))) then
+content := ord(High(TAmmoType));
 case crate of
-HealthCrate: begin
+HealthCrate:
+begin
 FollowGear^.Pos := posCaseHealth;
 FollowGear^.Health := content;
 AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpAmmoInfo);
 end;
-AmmoCrate: begin
+AmmoCrate:
+begin
 FollowGear^.Pos := posCaseAmmo;
 FollowGear^.AmmoType := TAmmoType(content);
 AddCaption(GetEventString(eidNewAmmoPack), cWhiteColor, capgrpAmmoInfo);
 end;
-UtilityCrate: begin
+UtilityCrate:
+begin
 FollowGear^.Pos := posCaseUtility;
 FollowGear^.AmmoType := TAmmoType(content);
 AddCaption(GetEventString(eidNewUtilityPack), cWhiteColor, capgrpAmmoInfo);
 end;
 end;
-if ( (x = 0) and (y = 0) ) then FindPlace(FollowGear, true, 0, LAND_WIDTH);
+if ( (x = 0) and (y = 0) ) then
+FindPlace(FollowGear, true, 0, LAND_WIDTH);
 SpawnCustomCrateAt := FollowGear;
 end;
 function SpawnFakeCrateAt(x, y: LongInt; crate: TCrateType; explode: boolean; poison: boolean): PGear;
 begin
 FollowGear := AddGear(x, y, gtCase, 0, _0, _0, 0);
 cCaseFactor := 0;
 FollowGear^.Pos := posCaseDummy;
-if explode then FollowGear^.Pos := FollowGear^.Pos + posCaseExplode;
+if explode then
-if poison then FollowGear^.Pos := FollowGear^.Pos + posCasePoison;
+FollowGear^.Pos := FollowGear^.Pos + posCaseExplode;
+if poison then
+FollowGear^.Pos := FollowGear^.Pos + posCasePoison;
 case crate of
-HealthCrate: begin
+HealthCrate:
+begin
 FollowGear^.Pos := FollowGear^.Pos + posCaseHealth;
 AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpAmmoInfo);
 end;
-AmmoCrate: begin
+AmmoCrate:
+begin
 FollowGear^.Pos := FollowGear^.Pos + posCaseAmmo;
 AddCaption(GetEventString(eidNewAmmoPack), cWhiteColor, capgrpAmmoInfo);
 end;
-UtilityCrate: begin
+UtilityCrate:
+begin
 FollowGear^.Pos := FollowGear^.Pos + posCaseUtility;
 AddCaption(GetEventString(eidNewUtilityPack), cWhiteColor, capgrpAmmoInfo);
 end;
 end;
-if ( (x = 0) and (y = 0) ) then FindPlace(FollowGear, true, 0, LAND_WIDTH);
+if ( (x = 0) and (y = 0) ) then
+FindPlace(FollowGear, true, 0, LAND_WIDTH);
 SpawnFakeCrateAt := FollowGear;
 end;
 function GetAmmo(Hedgehog: PHedgehog): TAmmoType;
 i:= Low(TAmmoType);
 if (t > 0) then
 begin
 t:= GetRandom(t);
 while t >= 0 do
 begin
 inc(i);
 if (Ammoz[i].Ammo.Propz and ammoprop_Utility) = 0 then
 dec(t, Ammoz[i].Probability)
 end
 end;
 GetAmmo:= i
 end;
 function GetUtility(Hedgehog: PHedgehog): TAmmoType;
 i: TAmmoType;
 begin
 uTot:= 0;
 for i:= Low(TAmmoType) to High(TAmmoType) do
-if ((Ammoz[i].Ammo.Propz and ammoprop_Utility) <> 0) and ((Hedgehog^.Team^.HedgehogsNumber > 1) or (Ammoz[i].Ammo.AmmoType <> amSwitch)) then
+if ((Ammoz[i].Ammo.Propz and ammoprop_Utility) <> 0)
+and ((Hedgehog^.Team^.HedgehogsNumber > 1) or (Ammoz[i].Ammo.AmmoType <> amSwitch)) then
 inc(uTot, Ammoz[i].Probability);
 t:= uTot;
 i:= Low(TAmmoType);
 if (t > 0) then
 begin
 t:= GetRandom(t);
 while t >= 0 do
 begin
 inc(i);
-if ((Ammoz[i].Ammo.Propz and ammoprop_Utility) <> 0) and ((Hedgehog^.Team^.HedgehogsNumber > 1) or (Ammoz[i].Ammo.AmmoType <> amSwitch)) then
+if ((Ammoz[i].Ammo.Propz and ammoprop_Utility) <> 0) and ((Hedgehog^.Team^.HedgehogsNumber > 1)
-dec(t, Ammoz[i].Probability)
+or (Ammoz[i].Ammo.AmmoType <> amSwitch)) then
-end
+dec(t, Ammoz[i].Probability)
+end
 end;
 GetUtility:= i
 end;
 procedure SpawnBoxOfSmth;
 var t, aTot, uTot, a, h: LongInt;
 i: TAmmoType;
 begin
 if (PlacingHogs) or
-(cCaseFactor = 0) or
+(cCaseFactor = 0)
-(CountGears(gtCase) >= 5) or
+or (CountGears(gtCase) >= 5)
-(GetRandom(cCaseFactor) <> 0) then exit;
+or (GetRandom(cCaseFactor) <> 0) then
+exit;
 FollowGear:= nil;
 aTot:= 0;
 uTot:= 0;
 for i:= Low(TAmmoType) to High(TAmmoType) do
 procedure chSkip(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
-if not CurrentTeam^.ExtDriven then SendIPC(',');
+if not CurrentTeam^.ExtDriven then
+SendIPC(',');
 uStats.Skipped;
 skipFlag:= true
 end;
 procedure chHogSay(var s: shortstring);
 t:= 0;
 x:= byte(s[1]);  // speech type
 if x < 4 then
 begin
 t:= byte(s[2]);  // team
-if Length(s) > 2 then h:= byte(s[3])  // target hog
+if Length(s) > 2 then
+h:= byte(s[3])  // target hog
 end;
 // allow targetting a hog by specifying a number as the first portion of the text
-if (x < 4) and (h > byte('0')) and (h < byte('9')) then i:= h - 48;
+if (x < 4) and (h > byte('0')) and (h < byte('9')) then
-if i <> 0 then text:= copy(s, 4, Length(s) - 1)
+i:= h - 48;
-else if x < 4 then text:= copy(s, 3, Length(s) - 1)
+if i <> 0 then
+text:= copy(s, 4, Length(s) - 1)
+else if x < 4 then
+text:= copy(s, 3, Length(s) - 1)
 else text:= copy(s, 2, Length(s) - 1);
 (*
 if CheckNoTeamOrHH then
 begin
 *)
 if (x < 4) and (TeamsArray[t] <> nil) then
 begin
 // if team matches current hedgehog team, default to current hedgehog
-if (i = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Team = TeamsArray[t]) then hh:= CurrentHedgehog
+if (i = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Team = TeamsArray[t]) then
+hh:= CurrentHedgehog
 else
 begin
 // otherwise use the first living hog or the hog amongs the remaining ones indicated by i
 j:= 0;
 c:= 0;

changeset 6580	6155187bf599
parent 6543	697e9b730189
child 6596	4c06ea12de1c