From e1997b7f04396cc55bbb50132a945b0560d43b13 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 18 May 2012 13:17:35 +0200
Subject: [PATCH] Issue #256: added MagicEffects::add overload for EffectLists

---
 apps/openmw/mwmechanics/magiceffects.cpp | 19 +++++++++++++++++++
 apps/openmw/mwmechanics/magiceffects.hpp |  3 +++
 apps/openmw/mwmechanics/spells.cpp       |  8 +-------
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 1c73bf1b15..52811084f4 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -1,6 +1,8 @@
 
 #include "magiceffects.hpp"
 
+#include <cstdlib>
+
 #include <stdexcept>
 
 #include <components/esm/defs.hpp>
@@ -66,6 +68,23 @@ namespace MWMechanics
         }
     }
 
+    void MagicEffects::add (const ESM::EffectList& list)
+    {
+        for (std::vector<ESM::ENAMstruct>::const_iterator iter (list.list.begin()); iter!=list.list.end();
+            ++iter)
+        {
+            EffectParam param;
+
+            if (iter->magnMin>=iter->magnMax)
+                param.mMagnitude = iter->magnMin;
+            else
+                param.mMagnitude = static_cast<int> (
+                    (iter->magnMax-iter->magnMin+1)*(std::rand() / RAND_MAX) + iter->magnMin);
+
+            add (*iter, param);
+        }
+    }
+
     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 3d36ea813d..d47101d458 100644
--- a/apps/openmw/mwmechanics/magiceffects.hpp
+++ b/apps/openmw/mwmechanics/magiceffects.hpp
@@ -6,6 +6,7 @@
 namespace ESM
 {
     struct ENAMstruct;
+    struct EffectList;
 }
 
 namespace MWMechanics
@@ -66,6 +67,8 @@ namespace MWMechanics
 
             void add (const EffectKey& key, const EffectParam& param);
 
+            void add (const ESM::EffectList& list);
+
             EffectParam get (const EffectKey& key) const;
             ///< This function can safely be used for keys that are not present.
 
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index a53c75dc22..af43cdfb55 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -13,13 +13,7 @@ namespace MWMechanics
 {
     void Spells::addSpell (const ESM::Spell *spell, MagicEffects& effects) const
     {
-        for (std::vector<ESM::ENAMstruct>::const_iterator iter = spell->effects.list.begin();
-            iter!=spell->effects.list.end(); ++iter)
-        {
-            EffectParam param;
-            param.mMagnitude = iter->magnMax; /// \todo calculate magnitude
-            effects.add (EffectKey (*iter), param);
-        }
+        effects.add (spell->effects);
     }
 
     Spells::TIterator Spells::begin() const