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
@@ -918,7 +918,7 @@ int32 Merc::CalcMaxHP() {
max_hp += GroupLeadershipAAHealthEnhancement();
max_hp += max_hp * (spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000;
max_hp += max_hp * ((spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000.0f);
if (cur_hp > max_hp)
cur_hp = max_hp;