games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-29 21:56:54 +02:00
Code Issues Releases Activity

Fixed 625, probably also 628 and 568. Minor fixes.

Browse Source
This commit is contained in:
DjWarmonger 2010-10-27 09:01:27 +00:00
parent 3b0f0a7a4e
commit d823b18c72
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hch/CObjectHandler.cpp
View File

@ -6545,10 +6545,11 @@ void CArmedInstance::randomizeArmy(int type)
void CArmedInstance::getParents(TCNodes &out, const CBonusSystemNode *root /*= NULL*/) const
{
/* //already given via PlayerState->getBonuses();
const PlayerState *p = cb->getPlayerState(tempOwner);
if (p && p != root)
out.insert(p); //hero always inherits bonuses from player
out.insert(p);
*/
out.insert(&cb->gameState()->globalEffects); //global effects are always active I believe
if(battle)

2
lib/CGameState.cpp
View File

@ -3613,7 +3613,7 @@ ui32 BattleInfo::calculateSpellDmg( const CSpell * sp, const CGHeroInstance * ca
ret /= 100;
}
}
calculateSpellBonus(ret, sp, caster, affectedCreature);
ret = calculateSpellBonus(ret, sp, caster, affectedCreature);
return ret;
}