games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

* small fix

Browse Source
This commit is contained in:
mateuszb 2010-09-02 14:41:35 +00:00
parent 608e26b453
commit dc0cdf68b6
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/CGameState.cpp
View File

@ -975,23 +975,18 @@ int CStack::occupiedHex() const
}
BonusList CStack::getSpellBonuses() const
{
return getBonuses(Selector::sourceTypeSel(Bonus::SPELL_EFFECT));
return getBonuses(Selector::sourceTypeSel(Bonus::CASTED_SPELL));
}
std::vector<si32> CStack::activeSpells() const
{
//spell ID deduplication (some spells have many corresponding bonuses)
//TODO: what about spells that casted multiple times, have their effect muliplied? std::pair<spell id, time> or what?
std::vector<si32> ret;
BonusList spellEffects = getSpellBonuses();
std::set<int> spellIds;
for(BonusList::const_iterator it = spellEffects.begin(); it != spellEffects.end(); it++)
{
spellIds.insert(it->id);
ret.push_back(it->id);
}
ret.resize(spellIds.size());
std::copy(spellIds.begin(), spellIds.end(), ret.begin());
return ret;
}