From 7d8ca91286413cfacbfeea28142e25d8070beacb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 3 Jan 2014 04:56:54 +0100
Subject: [PATCH] Implement RemoveSpellEffects instruction

---
 apps/openmw/mwmechanics/activespells.cpp |  6 ++++++
 apps/openmw/mwmechanics/activespells.hpp |  5 ++++-
 apps/openmw/mwscript/docs/vmformat.txt   |  4 +++-
 apps/openmw/mwscript/statsextensions.cpp | 19 +++++++++++++++++++
 components/compiler/extensions0.cpp      |  2 ++
 components/compiler/opcodes.hpp          |  3 +++
 6 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 1cdb74407..2a7165974 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -150,6 +150,12 @@ namespace MWMechanics
         mSpellsChanged = true;
     }
 
+    void ActiveSpells::removeEffects(const std::string &id)
+    {
+        mSpells.erase(Misc::StringUtils::lowerCase(id));
+        mSpellsChanged = true;
+    }
+
     void ActiveSpells::visitEffectSources(EffectSourceVisitor &visitor) const
     {
         for (TContainer::const_iterator it = begin(); it != end(); ++it)
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 57f224f6f..2ddb4ec55 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -81,7 +81,10 @@ namespace MWMechanics
             void addSpell (const std::string& id, bool stack, std::vector<Effect> effects,
                            const std::string& displayName, const std::string& casterHandle);
 
-            /// Remove all active effects with this id
+            /// Removes the active effects from this spell/potion/.. with \a id
+            void removeEffects (const std::string& id);
+
+            /// Remove all active effects with this effect id
             void purgeEffect (short effectId);
 
             /// Remove all active effects, if roll succeeds (for each effect)
diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index 3d7b281f8..25bf3429f 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -362,4 +362,6 @@ op 0x2000227: Cast
 op 0x2000228: Cast, explicit
 op 0x2000229: ExplodeSpell
 op 0x200022a: ExplodeSpell, explicit
-opcodes 0x200022b-0x3ffffff unused
+op 0x200022b: RemoveSpellEffects
+op 0x200022c: RemoveSpellEffects, explicit
+opcodes 0x200022d-0x3ffffff unused
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index a899b05f0..6aa19681d 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -459,6 +459,22 @@ namespace MWScript
                 }
         };
 
+        template<class R>
+        class OpRemoveSpellEffects : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string spellid = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getActiveSpells().removeEffects(spellid);
+                }
+        };
+
         template<class R>
         class OpGetSpell : public Interpreter::Opcode0
         {
@@ -1135,6 +1151,9 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpell, new OpRemoveSpell<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpellExplicit,
                 new OpRemoveSpell<ExplicitRef>);
+            interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpellEffects, new OpRemoveSpellEffects<ImplicitRef>);
+            interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpellEffectsExplicit,
+                new OpRemoveSpellEffects<ExplicitRef>);
 
             interpreter.installSegment5 (Compiler::Stats::opcodeGetSpell, new OpGetSpell<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Stats::opcodeGetSpellExplicit, new OpGetSpell<ExplicitRef>);
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 47a653451..0fc0da9d0 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -391,6 +391,8 @@ namespace Compiler
             extensions.registerInstruction ("addspell", "c", opcodeAddSpell, opcodeAddSpellExplicit);
             extensions.registerInstruction ("removespell", "c", opcodeRemoveSpell,
                 opcodeRemoveSpellExplicit);
+            extensions.registerInstruction ("removespelleffects", "c", opcodeRemoveSpellEffects,
+                opcodeRemoveSpellEffectsExplicit);
             extensions.registerFunction ("getspell", 'l', "c", opcodeGetSpell, opcodeGetSpellExplicit);
 
             extensions.registerInstruction("pcraiserank","/S",opcodePCRaiseRank);
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index 9bc256413..671bf2ff7 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -369,6 +369,9 @@ namespace Compiler
         const int opcodeIsWerewolfExplicit = 0x20001fe;
 
         const int opcodeGetWerewolfKills = 0x20001e2;
+
+        const int opcodeRemoveSpellEffects = 0x200022b;
+        const int opcodeRemoveSpellEffectsExplicit = 0x200022c;
     }
 
     namespace Transformation