teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Show remnant corprus effects in magic window

Browse source
This commit is contained in:
MiroslavR 2016-07-02 05:17:24 +02:00
parent 7ddcf3a28c
commit 700dde116e
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwmechanics/spells.cpp
View file

@ -249,6 +249,10 @@ namespace MWMechanics
void Spells::visitEffectSources(EffectSourceVisitor &visitor) const
{
// needed to combine effects from mSpells and mPermanentSpellEffects,
// while still grouping them by their source spell
std::map<SpellKey, MagicEffects> combinedEffects;
for (TIterator it = begin(); it != end(); ++it)
{
const ESM::Spell* spell = it->first;
@ -272,7 +276,24 @@ namespace MWMechanics
random = it->second.mEffectRands.at(i);
float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * random;
visitor.visit(MWMechanics::EffectKey(*effectIt), spell->mName, spell->mId, -1, magnitude);
combinedEffects[spell].add(MWMechanics::EffectKey(*effectIt), magnitude);
}
}
for (std::map<SpellKey, MagicEffects>::const_iterator it = mPermanentSpellEffects.begin();
it != mPermanentSpellEffects.end(); ++it)
{
combinedEffects[it->first] += it->second;
}
for (std::map<SpellKey, MagicEffects>::const_iterator it = combinedEffects.begin();
it != combinedEffects.end(); ++it)
{
const ESM::Spell * spell = it->first;
for (MagicEffects::Collection::const_iterator effectIt = it->second.begin();
effectIt != it->second.end(); ++effectIt)
{
visitor.visit(effectIt->first, spell->mName, spell->mId, -1, effectIt->second.getMagnitude());
}
}
}