diff options
author | jvoisin <julien.voisin@dustri.org> | 2022-01-05 18:29:23 +0000 |
---|---|---|
committer | jvoisin <julien.voisin@dustri.org> | 2022-01-05 18:29:23 +0000 |
commit | b56406b0addb124f9e369198a54f8510cd146a2f (patch) | |
tree | 37a957ed014d9952c6684a4bde54f604d057da4c | |
parent | bafde5c9c4649bcb625963fb8afe2a2e2f8562f7 (diff) | |
parent | cd6edb961a064249f3ac3fab27bbbde8cb4e4121 (diff) |
Merge branch 'deadcode' into 'master'
Remove dead code
See merge request OpenMW/openmw!1537
-rw-r--r-- | apps/openmw/mwmechanics/magiceffects.cpp | 22 | ||||
-rw-r--r-- | apps/openmw/mwmechanics/magiceffects.hpp | 2 |
2 files changed, 0 insertions, 24 deletions
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp index 39d340e6ba..e9e0be397e 100644 --- a/apps/openmw/mwmechanics/magiceffects.cpp +++ b/apps/openmw/mwmechanics/magiceffects.cpp @@ -133,28 +133,6 @@ namespace MWMechanics } } - MagicEffects& MagicEffects::operator+= (const MagicEffects& effects) - { - if (this==&effects) - { - const MagicEffects& temp (effects); - *this += temp; - return *this; - } - - for (Collection::const_iterator iter (effects.begin()); iter!=effects.end(); ++iter) - { - Collection::iterator result = mCollection.find (iter->first); - - if (result!=mCollection.end()) - result->second += iter->second; - else - mCollection.insert (*iter); - } - - return *this; - } - EffectParam MagicEffects::get (const EffectKey& key) const { Collection::const_iterator iter = mCollection.find (key); diff --git a/apps/openmw/mwmechanics/magiceffects.hpp b/apps/openmw/mwmechanics/magiceffects.hpp index 50f4dab050..e8175f6a78 100644 --- a/apps/openmw/mwmechanics/magiceffects.hpp +++ b/apps/openmw/mwmechanics/magiceffects.hpp @@ -97,8 +97,6 @@ namespace MWMechanics /// Copy Modifier values from \a effects, but keep original mBase values. void setModifiers(const MagicEffects& effects); - MagicEffects& operator+= (const MagicEffects& effects); - EffectParam get (const EffectKey& key) const; ///< This function can safely be used for keys that are not present. |