Merge branch 'magical_rat' into 'master'

Register copied Spells with SpellList

See merge request OpenMW/openmw!662

apps/openmw/mwmechanics/spells.cpp

@@ -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();

apps/openmw/mwmechanics/spells.hpp

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