# HG changeset patch # User Henek # Date 1292212428 -3600 # Node ID 9b30be24674222c0cf2dc38604ac0546d8357deb # Parent 1dd97c710f5a8da05507fb65965b56ca7527ab02# Parent c62e6e5228493c6f95b0e7a835e24a9c4f273d64 my first merge :( diff -r 1dd97c710f5a -r 9b30be246742 hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Mon Dec 13 04:52:23 2010 +0100 +++ b/hedgewars/uTeams.pas Mon Dec 13 04:53:48 2010 +0100 @@ -379,7 +379,7 @@ begin MaxTeamHealth:= NewTeamHealthBarWidth; RecountAllTeamsHealth; - end else NewTeamHealthBarWidth:= (NewTeamHealthBarWidth * cTeamHealthWidth) div MaxTeamHealth + end else if NewTeamHealthBarWidth > 0 then NewTeamHealthBarWidth:= (NewTeamHealthBarWidth * cTeamHealthWidth) div MaxTeamHealth end; RecountClanHealth(team^.Clan);