games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Merge beta -> develop

Browse Source
This commit is contained in:
Ivan Savenko
2023-04-26 22:45:41 +03:00
parent 1bb5077231 9296306fa3
commit fb739e7186
34 changed files with 307 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CStack.cpp
View File

@ -128,7 +128,7 @@ std::vector<si32> CStack::activeSpells() const
CSelector selector = Selector::sourceType()(Bonus::SPELL_EFFECT)
.And(CSelector([](const Bonus * b)->bool
{
return b->type != Bonus::NONE;
return b->type != Bonus::NONE && SpellID(b->sid).toSpell() && !SpellID(b->sid).toSpell()->isAdventure();
}));
TConstBonusListPtr spellEffects = getBonuses(selector, Selector::all, cachingStr.str());