From 238325455d6a15ae12e162ee796fae5fe8cab809 Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Sun, 23 Nov 2014 12:40:55 +0100
Subject: [PATCH] Erase effects that have expired (Fixes #2134)

---
 apps/openmw/mwmechanics/activespells.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index e64a736c3..d87e22543 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -17,18 +17,35 @@ namespace MWMechanics
 
         MWWorld::TimeStamp now = MWBase::Environment::get().getWorld()->getTimeStamp();
 
-        // Erase no longer active spells
+        // Erase no longer active spells and effects
         if (mLastUpdate!=now)
         {
             TContainer::iterator iter (mSpells.begin());
             while (iter!=mSpells.end())
+            {
                 if (!timeToExpire (iter))
                 {
                     mSpells.erase (iter++);
                     rebuild = true;
                 }
                 else
+                {
+                    std::vector<ActiveEffect>& effects = iter->second.mEffects;
+                    for (std::vector<ActiveEffect>::iterator effectIt = effects.begin(); effectIt != effects.end();)
+                    {
+                        MWWorld::TimeStamp start = iter->second.mTimeStamp;
+                        MWWorld::TimeStamp end = start + static_cast<double>(effectIt->mDuration)*MWBase::Environment::get().getWorld()->getTimeScaleFactor()/(60*60);
+                        if (end <= now)
+                        {
+                            effectIt = effects.erase(effectIt);
+                            rebuild = true;
+                        }
+                        else
+                            ++effectIt;
+                    }
                     ++iter;
+                }
+            }
 
             mLastUpdate = now;
         }