diff -r d1cf1ff6cabb -r bf86c6cb9341 hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Sun Jan 24 00:02:57 2016 +0100 +++ b/hedgewars/uTeams.pas Sun Jan 31 16:07:14 2016 +0300 @@ -119,7 +119,7 @@ PrevHH, PrevTeam : LongWord; begin TargetPoint.X:= NoPointX; -TryDo(CurrentTeam <> nil, 'nil Team', true); +if checkFails(CurrentTeam <> nil, 'nil Team', true) then exit; with CurrentHedgehog^ do if (PreviousTeam <> nil) and PlacingHogs and Unplaced then begin @@ -355,9 +355,9 @@ var team: PTeam; c, t: LongInt; begin -TryDo(TeamsCount < cMaxTeams, 'Too many teams', true); +if checkFails(TeamsCount < cMaxTeams, 'Too many teams', true) then exit(nil); New(team); -TryDo(team <> nil, 'AddTeam: team = nil', true); +if checkFails(team <> nil, 'AddTeam: team = nil', true) then exit(nil); FillChar(team^, sizeof(TTeam), 0); team^.AttackBar:= 2; team^.CurrHedgehog:= 0; @@ -551,10 +551,10 @@ s:= ''; if (not isDeveloperMode) then exit; -TryDo((CurrentTeam <> nil), 'Can''t add hedgehogs yet, add a team first!', true); +if checkFails((CurrentTeam <> nil), 'Can''t add hedgehogs yet, add a team first!', true) then exit; with CurrentTeam^ do begin - TryDo(HedgehogsNumber<=cMaxHHIndex, 'Can''t add hedgehog to "' + TeamName + '"! (already ' + intToStr(HedgehogsNumber) + ' hogs)', true); + if checkFails(HedgehogsNumber<=cMaxHHIndex, 'Can''t add hedgehog to "' + TeamName + '"! (already ' + intToStr(HedgehogsNumber) + ' hogs)', true) then exit; SplitBySpace(id, s); SwitchCurrentHedgehog(@Hedgehogs[HedgehogsNumber]); CurrentHedgehog^.BotLevel:= StrToInt(id); @@ -562,7 +562,7 @@ Gear:= AddGear(0, 0, gtHedgehog, 0, _0, _0, 0); SplitBySpace(s, id); Gear^.Health:= StrToInt(s); - TryDo(Gear^.Health > 0, 'Invalid hedgehog health', true); + if checkFails(Gear^.Health > 0, 'Invalid hedgehog health', true) then exit; if (GameFlags and gfSharedAmmo) <> 0 then CurrentHedgehog^.AmmoStore:= Clan^.ClanIndex else if (GameFlags and gfPerHogAmmo) <> 0 then