hedgewars: comparison hedgewars/uAmmos.pas

equal deleted inserted replaced

-:fc52f7c22c9b
+:6155187bf599
 {$HINTS ON}
 FillChar(Ammo^, sizeof(Ammo^), 0);
 for a:= Low(TAmmoType) to High(TAmmoType) do
 begin
 if cnts[a] > 0 then
 begin
 TryDo(mi[Ammoz[a].Slot] <= cMaxSlotAmmoIndex, 'Ammo slot overflow', true);
 Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]]:= Ammoz[a].Ammo;
-with Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]] do Count:= cnts[a];
+with Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]] do
-inc(mi[Ammoz[a].Slot])
+Count:= cnts[a];
-end
+inc(mi[Ammoz[a].Slot])
+end
 end
 end;
 procedure AddAmmoStore;
 const probability: array [0..8] of LongWord = (0,20,30,60,100,200,400,600,800);
 if cnt = 9 then
 begin
 cnt:= AMMO_INFINITE;
 Ammoz[a].Probability:= 0
 end;
-if Ammoz[a].NumberInCase = 0 then Ammoz[a].Probability:= 0;
+if Ammoz[a].NumberInCase = 0 then
+Ammoz[a].Probability:= 0;
 // avoid things we already have by scheme
 // merge this into DisableSomeWeapons ?
-if ((a = amLowGravity) and ((GameFlags and gfLowGravity) <> 0)) or
+if ((a = amLowGravity) and ((GameFlags and gfLowGravity) <> 0))
-((a = amInvulnerable) and ((GameFlags and gfInvulnerable) <> 0)) or
+or ((a = amInvulnerable) and ((GameFlags and gfInvulnerable) <> 0))
-((a = amLaserSight) and ((GameFlags and gfLaserSight) <> 0)) or
+or ((a = amLaserSight) and ((GameFlags and gfLaserSight) <> 0))
-((a = amVampiric) and ((GameFlags and gfVampiric) <> 0)) or
+or ((a = amVampiric) and ((GameFlags and gfVampiric) <> 0))
-((a = amExtraTime) and (cHedgehogTurnTime >= 1000000)) then
+or ((a = amExtraTime) and (cHedgehogTurnTime >= 1000000)) then
 begin
 cnt:= 0;
 Ammoz[a].Probability:= 0
 end;
 ammos[a]:= cnt;
-if ((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0) and (Ammoz[a].SkipTurns = 0) and (a <> amTeleport) and (a <> amSkip) then
+if ((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0)
+and (Ammoz[a].SkipTurns = 0) and (a <> amTeleport) and (a <> amSkip) then
 Ammoz[a].SkipTurns:= 1;
-if ((GameFlags and gfPlaceHog) <> 0) and
+if ((GameFlags and gfPlaceHog) <> 0)
-(a <> amTeleport) and (a <> amSkip) and
+and (a <> amTeleport) and (a <> amSkip)
-(Ammoz[a].SkipTurns < 10000) then inc(Ammoz[a].SkipTurns,10000);
+and (Ammoz[a].SkipTurns < 10000) then
-if ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then ammos[a]:= AMMO_INFINITE
+inc(Ammoz[a].SkipTurns,10000);
+if ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then
+ammos[a]:= AMMO_INFINITE
 end
-else ammos[a]:= AMMO_INFINITE;
+else
+ammos[a]:= AMMO_INFINITE;
 if ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then
 InitialCounts[Pred(StoreCnt)][a]:= cnt
 else
 InitialCounts[Pred(StoreCnt)][a]:= ammos[a];
 end;
 begin
 with Hedgehog do
 begin
 slot:= Ammoz[am].Slot;
 ammoidx:= 0;
-while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> am) do inc(ammoidx);
+while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> am) do
+inc(ammoidx);
 GetAmmoEntry:= @Ammo^[slot, ammoidx];
-if (Ammo^[slot, ammoidx].AmmoType <> am) then GetAmmoEntry:= GetAmmoEntry(Hedgehog, amNothing)
+if (Ammo^[slot, ammoidx].AmmoType <> am) then
+GetAmmoEntry:= GetAmmoEntry(Hedgehog, amNothing)
 end;
 end;
 procedure AssignStores;
 var t: LongInt;
 i: Longword;
 begin
 for t:= 0 to Pred(TeamsCount) do
 with TeamsArray[t]^ do
 begin
 for i:= 0 to cMaxHHIndex do
 if Hedgehogs[i].Gear <> nil then
 begin
 Hedgehogs[i].Ammo:= GetAmmoByNum(Hedgehogs[i].AmmoStore);
 if (GameFlags and gfPlaceHog) <> 0 then
 Hedgehogs[i].CurAmmoType:= amTeleport
 else
 Hedgehogs[i].CurAmmoType:= amNothing
 end
 end
 end;
 procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType);
 var cnt: LongWord;
 a: PAmmo;
 begin
 a:= GetAmmoEntry(Hedgehog, ammo);
-if (a^.AmmoType <> amNothing) then cnt:= a^.Count
+if (a^.AmmoType <> amNothing) then
-else cnt:= 0;
+cnt:= a^.Count
+else
+cnt:= 0;
 if (cnt <> AMMO_INFINITE) then
 begin
 inc(cnt, Ammoz[ammo].NumberInCase);
 AddAmmo(Hedgehog, ammo, cnt)
 end
 hhammo:= Hedgehog.Ammo;
 for slot:= 0 to cMaxSlotIndex do
 for ami:= 0 to cMaxSlotAmmoIndex do
 if hhammo^[slot, ami].Count > 0 then
 ammos[hhammo^[slot, ami].AmmoType]:= hhammo^[slot, ami].Count;
 ammos[ammo]:= cnt;
 if ammos[ammo] > AMMO_INFINITE then ammos[ammo]:= AMMO_INFINITE;
 FillAmmoStore(hhammo, ammos);
 CurWeapon:= GetAmmoEntry(Hedgehog);
 with Hedgehog, CurWeapon^ do
 if (Count = 0) or (AmmoType = amNothing) then
 begin
 PackAmmo(Ammo, Ammoz[AmmoType].Slot);
 CurAmmoType:= amNothing
 end
 end;
 procedure PackAmmo(Ammo: PHHAmmo; Slot: LongInt);
 var ami: LongInt;
 b: boolean;
 begin
 repeat
 b:= false;
 ami:= 0;
 while (not b) and (ami < cMaxSlotAmmoIndex) do
 if (Ammo^[Slot, ami].Count = 0)
-and (Ammo^[Slot, ami + 1].Count > 0) then b:= true
+and (Ammo^[Slot, ami + 1].Count > 0) then
-else inc(ami);
+b:= true
-if b then // there is a free item in ammo stack
+else
-begin
+inc(ami);
-Ammo^[Slot, ami]:= Ammo^[Slot, ami + 1];
+if b then // there is a free item in ammo stack
-Ammo^[Slot, ami + 1].Count:= 0
+begin
-end;
+Ammo^[Slot, ami]:= Ammo^[Slot, ami + 1];
+Ammo^[Slot, ami + 1].Count:= 0
+end;
 until not b;
 end;
 procedure OnUsedAmmo(var Hedgehog: THedgehog);
 var CurWeapon: PAmmo;
 var slot, ami: LongInt;
 begin
 Slot:= Ammoz[Ammo].Slot;
 ami:= 0;
 while (ami <= cMaxSlotAmmoIndex) do
 begin
 with Hedgehog.Ammo^[Slot, ami] do
 if (AmmoType = Ammo) then
 exit((Count > 0) and (Hedgehog.Team^.Clan^.TurnNumber > Ammoz[AmmoType].SkipTurns));
 inc(ami)
 end;
 HHHasAmmo:= false
 end;
 else
 CurMaxAngle:= cMaxAngle;
 with Hedgehog.Gear^ do
 begin
-if Angle < CurMinAngle then Angle:= CurMinAngle;
+if Angle < CurMinAngle then
-if Angle > CurMaxAngle then Angle:= CurMaxAngle;
+Angle:= CurMinAngle;
+if Angle > CurMaxAngle then
+Angle:= CurMaxAngle;
 end
 end
 end;
 procedure SwitchToFirstLegalAmmo(var Hedgehog: THedgehog);
 ammoidx:= 0;
 while (slot <= cMaxSlotIndex) and
 ((Ammo^[slot, ammoidx].Count = 0) or
 (Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
 do
 begin
-while (ammoidx <= cMaxSlotAmmoIndex) and
+while (ammoidx <= cMaxSlotAmmoIndex)
-((Ammo^[slot, ammoidx].Count = 0) or
+and ((Ammo^[slot, ammoidx].Count = 0) or (Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
-(Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
+do inc(ammoidx);
-do inc(ammoidx);
 if (ammoidx > cMaxSlotAmmoIndex) then
 begin
 ammoidx:= 0;
 inc(slot)
 CurWeapon:= GetAmmoEntry(Hedgehog);
 if (CurWeapon^.Count = 0) then
 SwitchToFirstLegalAmmo(Hedgehog)
-else if CurWeapon^.AmmoType = amNothing then Hedgehog.CurAmmoType:= amNothing;
+else if CurWeapon^.AmmoType = amNothing then
+Hedgehog.CurAmmoType:= amNothing;
 CurWeapon:= GetAmmoEntry(Hedgehog);
 ApplyAngleBounds(Hedgehog, CurWeapon^.AmmoType);
 if (Count <> AMMO_INFINITE) and not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0)) then
 s:= s + ' (' + IntToStr(Count) + ')';
 if (Propz and ammoprop_Timerable) <> 0 then
 s:= s + ', ' + IntToStr(Timer div 1000) + ' ' + trammo[sidSeconds];
 AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo);
-if (Propz and ammoprop_NeedTarget) <> 0
+if (Propz and ammoprop_NeedTarget) <> 0 then
-then begin
+begin
 Gear^.State:= Gear^.State or      gstHHChooseTarget;
 isCursorVisible:= true
-end else begin
+end
+else
+begin
 Gear^.State:= Gear^.State and not gstHHChooseTarget;
 isCursorVisible:= false
 end;
 end
 end;
 end;
 procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog);
 begin
 with Hedgehog do
-if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_DontHold) <> 0) or
+if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_DontHold) <> 0)
-(Ammoz[CurAmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then
+or (Ammoz[CurAmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then
 SwitchToFirstLegalAmmo(Hedgehog);
 end;
 procedure SetWeapon(weap: TAmmoType);
 begin
 PackAmmo(StoresList[i], slot)
 end;
 for t:= Low(TAmmoType) to High(TAmmoType) do
-if (Ammoz[t].Ammo.Propz and ammoprop_NotBorder) <> 0 then Ammoz[t].Probability:= 0
+if (Ammoz[t].Ammo.Propz and ammoprop_NotBorder) <> 0 then
+Ammoz[t].Probability:= 0
 end;
 procedure SetAmmoLoadout(s: shortstring);
 begin
 ammoLoadout:= s;
 procedure ResetWeapons;
 var i, t: Longword;
 a: TAmmoType;
 begin
 for t:= 0 to Pred(TeamsCount) do
 with TeamsArray[t]^ do
 for i:= 0 to cMaxHHIndex do
 Hedgehogs[i].CurAmmoType:= amNothing;
-for i:= 0 to Pred(StoreCnt) do FillAmmoStore(StoresList[i], InitialCounts[i]);
+for i:= 0 to Pred(StoreCnt) do
+FillAmmoStore(StoresList[i], InitialCounts[i]);
 for a:= Low(TAmmoType) to High(TAmmoType) do
-if Ammoz[a].SkipTurns >= 10000 then dec(Ammoz[a].SkipTurns,10000)
+if Ammoz[a].SkipTurns >= 10000 then
+dec(Ammoz[a].SkipTurns,10000)
 end;
 procedure chAddAmmoStore(var descr: shortstring);
 procedure freeModule;
 var i: LongWord;
 begin
 if StoreCnt > 0 then
-for i:= 0 to Pred(StoreCnt) do Dispose(StoresList[i])
+for i:= 0 to Pred(StoreCnt) do
+Dispose(StoresList[i])
 end;
 end.

changeset 6580	6155187bf599
parent 6519	b0dc69bb1f54
child 6622	01889d5bc79b