diff -r 88e49851d814 -r 14224c9b4594 hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Sun Nov 27 00:57:43 2011 +0100 +++ b/hedgewars/uTeams.pas Sun Nov 27 14:46:57 2011 +0300 @@ -142,7 +142,7 @@ c:= CurrentTeam^.Clan^.ClanIndex; repeat with ClansArray[c]^ do - if (CurrTeam = TagTeamIndex) and ((GameFlags And gfTagTeam) <> 0) then + if (CurrTeam = TagTeamIndex) and ((GameFlags and gfTagTeam) <> 0) then begin TagTeamIndex:= Pred(TagTeamIndex) mod TeamsNumber; CurrTeam:= Pred(CurrTeam) mod TeamsNumber; @@ -150,7 +150,7 @@ NextClan:= true; end; - if (GameFlags And gfTagTeam) = 0 then inc(c); + if (GameFlags and gfTagTeam) = 0 then inc(c); if c = ClansCount then begin @@ -171,7 +171,7 @@ CurrHedgehog:= Succ(CurrHedgehog) mod HedgehogsNumber; until (Hedgehogs[CurrHedgehog].Gear <> nil) or (CurrHedgehog = PrevHH) end - until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) or (PrevTeam = CurrTeam) or ((CurrTeam = TagTeamIndex) and ((GameFlags And gfTagTeam) <> 0)); + until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) or (PrevTeam = CurrTeam) or ((CurrTeam = TagTeamIndex) and ((GameFlags and gfTagTeam) <> 0)); end until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil); @@ -243,7 +243,7 @@ if CurrentHedgehog^.Unplaced then TurnTimeLeft:= 15000 else TurnTimeLeft:= 0 end -else if ((GameFlags And gfTagTeam) <> 0) and not NextClan then +else if ((GameFlags and gfTagTeam) <> 0) and (not NextClan) then begin if TagTurnTimeLeft <> 0 then TurnTimeLeft:= TagTurnTimeLeft; TagTurnTimeLeft:= 0;