hedgewars-draft: comparison hedgewars/uTeams.pas

equal deleted inserted replaced

-:fc52f7c22c9b
+:6155187bf599
 inc(AliveCount);
 AliveClan:= ClansArray[t]
 end;
 if (AliveCount > 1)
-or ((AliveCount = 1) and ((GameFlags and gfOneClanMode) <> 0)) then exit(false);
+or ((AliveCount = 1) and ((GameFlags and gfOneClanMode) <> 0)) then
+exit(false);
 CheckForWin:= true;
 TurnTimeLeft:= 0;
 ReadyTimeLeft:= 0;
 if not GameOver then
 if AliveCount = 0 then
 begin // draw
 AddCaption(trmsg[sidDraw], cWhiteColor, capgrpGameState);
 SendStat(siGameResult, trmsg[sidDraw]);
 AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000)
-end else // win
+end
+else // win
 with AliveClan^ do
 begin
 if TeamsNumber = 1 then
 s:= Format(shortstring(trmsg[sidWinner]), Teams[0]^.TeamName)  // team wins
 else
 Unplaced:= false;
 if Gear <> nil then
 begin
 DeleteCI(Gear);
 FindPlace(Gear, false, 0, LAND_WIDTH);
-if Gear <> nil then AddGearCI(Gear)
+if Gear <> nil then
+AddGearCI(Gear)
 end
 end;
 PreviousTeam:= CurrentTeam;
 begin
 c:= CurrHedgehog;
 repeat
 begin
 inc(c);
-if c > cMaxHHIndex then c:= 0
+if c > cMaxHHIndex then
+c:= 0
 end
 until (c = CurrHedgehog) or (Hedgehogs[c].Gear <> nil);
 LocalAmmo:= Hedgehogs[c].AmmoStore
 end;
 CurrTeam:= Pred(CurrTeam) mod TeamsNumber;
 inc(c);
 NextClan:= true;
 end;
-if (GameFlags and gfTagTeam) = 0 then inc(c);
+if (GameFlags and gfTagTeam) = 0 then
+inc(c);
 if c = ClansCount then
 begin
-if not PlacingHogs then inc(TotalRounds);
+if not PlacingHogs then
+inc(TotalRounds);
 c:= 0
 end;
 with ClansArray[c]^ do
 begin
 var i, t: LongInt;
 CurWeapon: PAmmo;
 begin
 if PlacingHogs then
 begin
 PlacingHogs:= false;
 for t:= 0 to Pred(TeamsCount) do
 for i:= 0 to cMaxHHIndex do
 if (TeamsArray[t]^.Hedgehogs[i].Gear <> nil) and (TeamsArray[t]^.Hedgehogs[i].Unplaced) then
 PlacingHogs:= true;
 if not PlacingHogs then // Reset  various things I mucked with
 begin
 for i:= 0 to ClansCount do
-if ClansArray[i] <> nil then ClansArray[i]^.TurnNumber:= 0;
+if ClansArray[i] <> nil then
-ResetWeapons
+ClansArray[i]^.TurnNumber:= 0;
-end
+ResetWeapons
-end;
+end
+end;
 inc(CurrentTeam^.Clan^.TurnNumber);
 CurWeapon:= GetAmmoEntry(CurrentHedgehog^);
-if CurWeapon^.Count = 0 then CurrentHedgehog^.CurAmmoType:= amNothing;
+if CurWeapon^.Count = 0 then
+CurrentHedgehog^.CurAmmoType:= amNothing;
 with CurrentHedgehog^ do
 begin
 with Gear^ do
 begin
 AddFileLog('Wind = '+FloatToStr(cWindSpeed));
 end;
 ApplyAmmoChanges(CurrentHedgehog^);
-if (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then SetBinds(CurrentTeam^.Binds);
+if (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then
+SetBinds(CurrentTeam^.Binds);
 bShowFinger:= true;
 if PlacingHogs then
 begin
-if CurrentHedgehog^.Unplaced then TurnTimeLeft:= 15000
+if CurrentHedgehog^.Unplaced then
+TurnTimeLeft:= 15000
 else TurnTimeLeft:= 0
 end
 else if ((GameFlags and gfTagTeam) <> 0) and (not NextClan) then
 begin
-if TagTurnTimeLeft <> 0 then TurnTimeLeft:= TagTurnTimeLeft;
+if TagTurnTimeLeft <> 0 then
+TurnTimeLeft:= TagTurnTimeLeft;
 TagTurnTimeLeft:= 0;
 end
 else
 begin
 TurnTimeLeft:= cHedgehogTurnTime;
 begin
 if CurrentTeam^.ExtDriven then
 AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
 else
 AddVoice(sndYesSir, CurrentTeam^.voicepack);
-if PlacingHogs or (cHedgehogTurnTime < 1000000) then ReadyTimeLeft:= cReadyDelay;
+if PlacingHogs or (cHedgehogTurnTime < 1000000) then
+ReadyTimeLeft:= cReadyDelay;
 AddCaption(Format(shortstring(trmsg[sidReady]), CurrentTeam^.TeamName), cWhiteColor, capgrpGameState)
 end
 else
 begin
 if TurnTimeLeft > 0 then
 inc(TeamsCount);
 c:= Pred(ClansCount);
 while (c >= 0) and (ClansArray[c]^.Color <> TeamColor) do dec(c);
 if c < 0 then
 begin
 new(team^.Clan);
 FillChar(team^.Clan^, sizeof(TClan), 0);
 ClansArray[ClansCount]:= team^.Clan;
 inc(ClansCount);
 with team^.Clan^ do
 begin
 ClanIndex:= Pred(ClansCount);
 Color:= TeamColor;
 TagTeamIndex:= 0;
 Flawless:= true
 end
-end else
+end
-begin
+else
-team^.Clan:= ClansArray[c];
+begin
-end;
+team^.Clan:= ClansArray[c];
+end;
 with team^.Clan^ do
 begin
 Teams[TeamsNumber]:= team;
 inc(TeamsNumber)
 LocalAmmo:= Hedgehogs[0].AmmoStore
 end;
 th:= 0;
 for i:= 0 to cMaxHHIndex do
 if Hedgehogs[i].Gear <> nil then
 inc(th, Hedgehogs[i].Gear^.Health);
-if th > MaxTeamHealth then MaxTeamHealth:= th;
+if th > MaxTeamHealth then
+MaxTeamHealth:= th;
 // Some initial King buffs
 if (GameFlags and gfKing) <> 0 then
 begin
 Hedgehogs[0].King:= true;
 Hedgehogs[0].Hat:= 'crown';
 Hedgehogs[0].Gear^.Health:= hwRound(int2hwFloat(th)*_0_375);
 if Hedgehogs[0].Gear^.Health > h then
 begin
 dec(th, h);
 inc(th, Hedgehogs[0].Gear^.Health);
-if th > MaxTeamHealth then MaxTeamHealth:= th
+if th > MaxTeamHealth then
+MaxTeamHealth:= th
 end
-else Hedgehogs[0].Gear^.Health:= h;
+else
+Hedgehogs[0].Gear^.Health:= h;
 Hedgehogs[0].InitialHealth:= Hedgehogs[0].Gear^.Health
 end;
 end;
 RecountAllTeamsHealth
 function  TeamSize(p: PTeam): Longword;
 var i, value: Longword;
 begin
 value:= 0;
 for i:= 0 to cMaxHHIndex do
-if p^.Hedgehogs[i].Gear <> nil then inc(value);
+if p^.Hedgehogs[i].Gear <> nil then
+inc(value);
 TeamSize:= value;
 end;
 procedure RecountClanHealth(clan: PClan);
 var i: LongInt;
 TeamHealth:= NewTeamHealthBarWidth;
 if NewTeamHealthBarWidth > MaxTeamHealth then
 begin
 MaxTeamHealth:= NewTeamHealthBarWidth;
 RecountAllTeamsHealth;
-end else if NewTeamHealthBarWidth > 0 then NewTeamHealthBarWidth:= (NewTeamHealthBarWidth * cTeamHealthWidth) div MaxTeamHealth
+end else if NewTeamHealthBarWidth > 0 then
+NewTeamHealthBarWidth:= (NewTeamHealthBarWidth * cTeamHealthWidth) div MaxTeamHealth
 end;
 RecountClanHealth(team^.Clan);
 AddVisualGear(0, 0, vgtTeamHealthSorter)
 procedure chAddHH(var id: shortstring);
 var s: shortstring;
 Gear: PGear;
 begin
 s:= '';
-if (not isDeveloperMode) or (CurrentTeam = nil) then exit;
+if (not isDeveloperMode) or (CurrentTeam = nil) then
-with CurrentTeam^ do
+exit;
-begin
+with CurrentTeam^ do
-SplitBySpace(id, s);
+begin
-CurrentHedgehog:= @Hedgehogs[HedgehogsNumber];
+SplitBySpace(id, s);
-val(id, CurrentHedgehog^.BotLevel);
+CurrentHedgehog:= @Hedgehogs[HedgehogsNumber];
-Gear:= AddGear(0, 0, gtHedgehog, 0, _0, _0, 0);
+val(id, CurrentHedgehog^.BotLevel);
-SplitBySpace(s, id);
+Gear:= AddGear(0, 0, gtHedgehog, 0, _0, _0, 0);
-val(s, Gear^.Health);
+SplitBySpace(s, id);
-TryDo(Gear^.Health > 0, 'Invalid hedgehog health', true);
+val(s, Gear^.Health);
-Gear^.Hedgehog^.Team:= CurrentTeam;
+TryDo(Gear^.Health > 0, 'Invalid hedgehog health', true);
-if (GameFlags and gfSharedAmmo) <> 0 then CurrentHedgehog^.AmmoStore:= Clan^.ClanIndex
+Gear^.Hedgehog^.Team:= CurrentTeam;
-else if (GameFlags and gfPerHogAmmo) <> 0 then
+if (GameFlags and gfSharedAmmo) <> 0 then
-begin
+CurrentHedgehog^.AmmoStore:= Clan^.ClanIndex
-AddAmmoStore;
+else if (GameFlags and gfPerHogAmmo) <> 0 then
-CurrentHedgehog^.AmmoStore:= StoreCnt - 1
+begin
-end
+AddAmmoStore;
-else CurrentHedgehog^.AmmoStore:= TeamsCount - 1;
+CurrentHedgehog^.AmmoStore:= StoreCnt - 1
-CurrentHedgehog^.Gear:= Gear;
-CurrentHedgehog^.Name:= id;
-CurrentHedgehog^.InitialHealth:= Gear^.Health;
-CurrHedgehog:= HedgehogsNumber;
-inc(HedgehogsNumber)
 end
+else CurrentHedgehog^.AmmoStore:= TeamsCount - 1;
+CurrentHedgehog^.Gear:= Gear;
+CurrentHedgehog^.Name:= id;
+CurrentHedgehog^.InitialHealth:= Gear^.Health;
+CurrHedgehog:= HedgehogsNumber;
+inc(HedgehogsNumber)
+end
 end;
 procedure chAddTeam(var s: shortstring);
 var Color: Longword;
 ts, cs: shortstring;
 begin
 cs:= '';
 ts:= '';
 if isDeveloperMode then
 begin
 SplitBySpace(s, cs);
 SplitBySpace(cs, ts);
 val(cs, Color);
 TryDo(Color <> 0, 'Error: black team color', true);
 // color is always little endian so the mask must be constant also in big endian archs
 Color:= Color or $FF000000;
+AddTeam(Color);
-AddTeam(Color);
+CurrentTeam^.TeamName:= ts;
-CurrentTeam^.TeamName:= ts;
+CurrentTeam^.PlayerHash:= s;
-CurrentTeam^.PlayerHash:= s;
+if GameType in [gmtDemo, gmtSave] then
-if GameType in [gmtDemo, gmtSave] then CurrentTeam^.ExtDriven:= true;
+CurrentTeam^.ExtDriven:= true;
 CurrentTeam^.voicepack:= AskForVoicepack('Default')
 end
 end;
 procedure chSetHHCoords(var x: shortstring);
 var y: shortstring;
 t: Longint;
 begin
 y:= '';
-if (not isDeveloperMode) or (CurrentHedgehog = nil) or (CurrentHedgehog^.Gear = nil) then exit;
+if (not isDeveloperMode) or (CurrentHedgehog = nil) or (CurrentHedgehog^.Gear = nil) then
+exit;
 SplitBySpace(x, y);
 val(x, t);
 CurrentHedgehog^.Gear^.X:= int2hwFloat(t);
 val(y, t);
 CurrentHedgehog^.Gear^.Y:= int2hwFloat(t)
 procedure chBind(var id: shortstring);
 var s: shortstring;
 b: LongInt;
 begin
 s:= '';
-if CurrentTeam = nil then exit;
+if CurrentTeam = nil then
+exit;
 SplitBySpace(id, s);
-if s[1]='"' then Delete(s, 1, 1);
+if s[1]='"' then
-if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1);
+Delete(s, 1, 1);
+if s[byte(s[0])]='"' then
+Delete(s, byte(s[0]), 1);
 b:= KeyNameToCode(id);
-if b = 0 then OutError(errmsgUnknownVariable + ' "' + id + '"', false)
+if b = 0 then
-else CurrentTeam^.Binds[b]:= s
+OutError(errmsgUnknownVariable + ' "' + id + '"', false)
+else
+CurrentTeam^.Binds[b]:= s
 end;
 procedure chTeamGone(var s:shortstring);
 var t: LongInt;
 begin
 t:= 0;
-while (t < cMaxTeams)
+while (t < cMaxTeams) and (TeamsArray[t] <> nil) and (TeamsArray[t]^.TeamName <> s) do
-and (TeamsArray[t] <> nil)
+inc(t);
-and (TeamsArray[t]^.TeamName <> s) do inc(t);
+if (t = cMaxTeams) or (TeamsArray[t] = nil) then
-if (t = cMaxTeams) or (TeamsArray[t] = nil) then exit;
+exit;
 with TeamsArray[t]^ do
 begin
 AddChatString('** '+ TeamName + ' is gone');
 hasGone:= true
 RecountAllTeamsHealth();
 end;
 procedure initModule;
 begin
 RegisterVariable('addhh', vtCommand, @chAddHH, false);
 RegisterVariable('addteam', vtCommand, @chAddTeam, false);
 RegisterVariable('hhcoords', vtCommand, @chSetHHCoords, false);
 RegisterVariable('bind', vtCommand, @chBind, true );
 RegisterVariable('teamgone', vtCommand, @chTeamGone, true );
 RegisterVariable('finish', vtCommand, @chFinish, true ); // all teams gone
 CurrentTeam:= nil;
 PreviousTeam:= nil;
 CurrentHedgehog:= nil;
 TeamsCount:= 0;
 ClansCount:= 0;
 LocalClan:= -1;
 LocalTeam:= -1;
 LocalAmmo:= -1;
 GameOver:= false;
 NextClan:= true;
 end;
 procedure freeModule;
 var i, h: LongWord;
 begin
 if TeamsCount > 0 then
 begin
 for i:= 0 to Pred(TeamsCount) do
 begin
 for h:= 0 to cMaxHHIndex do
 if TeamsArray[i]^.Hedgehogs[h].GearHidden <> nil then
 Dispose(TeamsArray[i]^.Hedgehogs[h].GearHidden);
 Dispose(TeamsArray[i]);
 end;
-for i:= 0 to Pred(ClansCount) do Dispose(ClansArray[i]);
+for i:= 0 to Pred(ClansCount) do
-end;
+Dispose(ClansArray[i]);
-TeamsCount:= 0;
+end;
-ClansCount:= 0;
+TeamsCount:= 0;
+ClansCount:= 0;
 end;
 end.

changeset 6580	6155187bf599
parent 6543	697e9b730189
child 6622	01889d5bc79b