mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 12:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deadcode' into 'master'

Browse Source 
Remove dead code

See merge request OpenMW/openmw!1537
This commit is contained in:
jvoisin 2022-01-05 18:29:23 +00:00
commit b56406b0ad
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/openmw/mwmechanics/magiceffects.cpp
View File

@ -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 EffectParam MagicEffects::get (const EffectKey& key) const
{ {
Collection::const_iterator iter = mCollection.find (key); Collection::const_iterator iter = mCollection.find (key);

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

@ -97,8 +97,6 @@ namespace MWMechanics
/// Copy Modifier values from \a effects, but keep original mBase values. /// Copy Modifier values from \a effects, but keep original mBase values.
void setModifiers(const MagicEffects& effects); void setModifiers(const MagicEffects& effects);
MagicEffects& operator+= (const MagicEffects& effects);
EffectParam get (const EffectKey& key) const; EffectParam get (const EffectKey& key) const;
///< This function can safely be used for keys that are not present. ///< This function can safely be used for keys that are not present.