games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Explicit use of limit selector in CBattleInfoCallback::getRandomBeneficialSpell

Browse Source 
* reverted changes in IBonusBearer::hasBonusFrom just in case
This commit is contained in:
AlexVinS 2016-10-01 07:28:03 +03:00
parent 902117d812
commit 730e3b6d0f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/CBattleCallback.cpp
View File

@ -1847,7 +1847,10 @@ SpellID CBattleInfoCallback::getRandomBeneficialSpell(CRandomGenerator & rand, c
for(const SpellID spellID : allPossibleSpells) for(const SpellID spellID : allPossibleSpells)
{ {
if (subject->hasBonusFrom(Bonus::SPELL_EFFECT, spellID) std::stringstream cachingStr;
cachingStr << "source_" << Bonus::SPELL_EFFECT << "id_" << spellID.num;
if(subject->hasBonus(Selector::source(Bonus::SPELL_EFFECT, spellID), Selector::all, cachingStr.str())
//TODO: this ability has special limitations //TODO: this ability has special limitations
|| battleCanCastThisSpellHere(subject, spellID.toSpell(), ECastingMode::CREATURE_ACTIVE_CASTING, subject->position) != ESpellCastProblem::OK) || battleCanCastThisSpellHere(subject, spellID.toSpell(), ECastingMode::CREATURE_ACTIVE_CASTING, subject->position) != ESpellCastProblem::OK)
continue; continue;

2
lib/HeroBonus.cpp
View File

@ -362,7 +362,7 @@ bool IBonusBearer::hasBonusFrom(Bonus::BonusSource source, ui32 sourceID) const
{ {
std::stringstream cachingStr; std::stringstream cachingStr;
cachingStr << "source_" << source << "id_" << sourceID; cachingStr << "source_" << source << "id_" << sourceID;
return hasBonus(Selector::source(source,sourceID), Selector::all, cachingStr.str()); return hasBonus(Selector::source(source,sourceID), cachingStr.str());
} }
int IBonusBearer::MoraleVal() const int IBonusBearer::MoraleVal() const