games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge branch 'develop' into mutexRelax

Browse Source
This commit is contained in:
DjWarmonger
2015-10-24 18:30:43 +02:00
parent 2851832f0c eb0af0096e
commit a6ea0981b6
105 changed files with 1747 additions and 1311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CGameInfoCallback.cpp
View File

@@ -182,7 +182,7 @@ int CGameInfoCallback::estimateSpellDamage(const CSpell * sp, const CGHeroInstan
ERROR_RET_VAL_IF(hero && !canGetFullInfo(hero), "Cannot get info about caster!", -1);
if (hero) //we see hero's spellbook
return sp->calculateDamage(hero, nullptr, hero->getSpellSchoolLevel(sp), hero->getPrimSkillLevel(PrimarySkill::SPELL_POWER));
return sp->calculateDamage(hero, nullptr, hero->getEffectLevel(sp), hero->getEffectPower(sp));
else
return 0; //mage guild
}