mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 03:15:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'magical_rat' into 'master'

Browse source 
Register copied Spells with SpellList

See merge request OpenMW/openmw!662
This commit is contained in:
Evil Eye 2021-03-16 19:50:15 +00:00
commit d1e8c6b223
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,14 @@ namespace MWMechanics
{
}
Spells::Spells(const Spells& spells) : mSpellList(spells.mSpellList), mSpells(spells.mSpells),
mSelectedSpell(spells.mSelectedSpell), mUsedPowers(spells.mUsedPowers),
mSpellsChanged(spells.mSpellsChanged), mEffects(spells.mEffects), mSourcedEffects(spells.mSourcedEffects)
{
if(mSpellList)
mSpellList->addListener(this);
}
std::map<const ESM::Spell*, SpellParams>::const_iterator Spells::begin() const
{
return mSpells.begin();

4
apps/openmw/mwmechanics/spells.hpp
View file

@ -57,6 +57,10 @@ namespace MWMechanics
Spells();
Spells(const Spells&);
Spells(const Spells&&) = delete;
~Spells();
static bool hasCorprusEffect(const ESM::Spell *spell);