Merge from master

This commit is contained in:
KimLS
2013-06-17 11:47:45 -07:00
10 changed files with 41 additions and 37 deletions
+1 -1
View File
@@ -11016,7 +11016,7 @@ int32 Bot::CalcMaxHP() {
bot_hp += GroupLeadershipAAHealthEnhancement();
bot_hp += bot_hp * (spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000;
bot_hp += bot_hp * ((spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000.0f);
max_hp = bot_hp;
if (cur_hp > max_hp)