mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-23 19:20:56 +00:00
Code Issues Projects Releases Wiki Activity

Add move constructor to MWMechanics::Spells

Browse Source
This commit is contained in:
elsid 2021-04-23 23:48:55 +02:00
parent 46e34c500c
commit ca7add0624
No known key found for this signature in database
GPG Key ID: B845CB9FEE18AB40
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwmechanics/spelllist.cpp
View File

@ -164,4 +164,12 @@ namespace MWMechanics
if (it != mListeners.end())
mListeners.erase(it);
}
void SpellList::updateListener(Spells* before, Spells* after)
{
const auto it = std::find(mListeners.begin(), mListeners.end(), before);
if (it == mListeners.end())
return mListeners.push_back(after);
*it = after;
}
}

2
apps/openmw/mwmechanics/spelllist.hpp
View File

@ -61,6 +61,8 @@ namespace MWMechanics
void removeListener(Spells* spells);
void updateListener(Spells* before, Spells* after);
const std::vector<std::string> getSpells() const;
};
}

9
apps/openmw/mwmechanics/spells.cpp
View File

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

2
apps/openmw/mwmechanics/spells.hpp
View File

@ -59,7 +59,7 @@ namespace MWMechanics
Spells(const Spells&);
Spells(const Spells&&) = delete;
Spells(Spells&& spells);
~Spells();