From 992b87ea441de3be8c673f300532f902330c0dda Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 6 Jan 2015 16:08:23 +0100
Subject: [PATCH] Reset existing summons when the spell is re-casted (Fixes
 #2135)

---
 apps/openmw/mwmechanics/spellcasting.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 9cfcdda184..b7c7e00a10 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -471,6 +471,20 @@ namespace MWMechanics
                 else
                     applyInstantEffect(target, caster, EffectKey(*effectIt), magnitude);
 
+                // Re-casting a summon effect will remove the creature from previous castings of that effect.
+                if (effectIt->mEffectID >= ESM::MagicEffect::SummonScamp
+                        && effectIt->mEffectID <= ESM::MagicEffect::SummonStormAtronach
+                        && !target.isEmpty() && target.getClass().isActor())
+                {
+                    CreatureStats& targetStats = target.getClass().getCreatureStats(target);
+                    std::map<CreatureStats::SummonKey, int>::iterator found = targetStats.getSummonedCreatureMap().find(std::make_pair(effectIt->mEffectID, mId));
+                    if (found != targetStats.getSummonedCreatureMap().end())
+                    {
+                        cleanupSummonedCreature(targetStats, found->second);
+                        targetStats.getSummonedCreatureMap().erase(found);
+                    }
+                }
+
                 // HACK: Damage attribute/skill actually has a duration, even though the actual effect is instant and permanent.
                 // This was probably just done to have the effect visible in the magic menu for a while
                 // to notify the player they've been damaged?