From c2901fe6ccb70b5511e631aab98946ac70d35f60 Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Mon, 7 Jan 2013 18:16:50 +0000
Subject: [PATCH] added addsoulgem scripting function

---
 apps/openmw/mwscript/docs/vmformat.txt  |  4 ++-
 apps/openmw/mwscript/miscextensions.cpp | 33 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index 89cacf65c..8fd65bf8a 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -306,5 +306,7 @@ op 0x20001ef: GetCurrentAIPackage
 op 0x20001f0: GetCurrentAIPackage, explicit reference
 op 0x20001f1: GetDetected
 op 0x20001f2: GetDetected, explicit reference
+op 0x20001f3: AddSoulGem
+op 0x20001f4: AddSoulGem, explicit reference
 
-opcodes 0x20001f3-0x3ffffff unused
+opcodes 0x20001f5-0x3ffffff unused
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index b687471aa..ff273a333 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -14,6 +14,8 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
+#include "../mwworld/manualref.hpp"
+#include "../mwworld/containerstore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/creaturestats.hpp"
@@ -305,6 +307,32 @@ namespace MWScript
                                       MWMechanics::EffectKey(key)).mMagnitude > 0);
                 }
         };
+        
+        template<class R>
+        class OpAddSoulGem : public Interpreter::Opcode0
+        {   
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {   
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string creature = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+                    
+                    std::string gem = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), gem);
+
+                    ref.getPtr().getRefData().setCount (1);
+                    
+                    ref.getPtr().getCellRef().mSoul = creature;
+
+                    MWWorld::Class::get (ptr).getContainerStore (ptr).add (ref.getPtr());
+
+                }   
+        };
 
         template <class R>
         class OpGetAttacked : public Interpreter::Opcode0
@@ -414,6 +442,8 @@ namespace MWScript
         const int opcodeGetLockedExplicit = 0x20001c8;
         const int opcodeGetEffect = 0x20001cf;
         const int opcodeGetEffectExplicit = 0x20001d0;
+        const int opcodeAddSoulGem = 0x20001f3;
+        const int opcodeAddSoulGemExplicit = 0x20001f4;
         const int opcodeGetAttacked = 0x20001d3;
         const int opcodeGetAttackedExplicit = 0x20001d4;
         const int opcodeGetWeaponDrawn = 0x20001d7;
@@ -452,6 +482,7 @@ namespace MWScript
             extensions.registerInstruction ("wakeuppc", "", opcodeWakeUpPc);
             extensions.registerFunction ("getlocked", 'l', "", opcodeGetLocked, opcodeGetLockedExplicit);
             extensions.registerFunction ("geteffect", 'l', "l", opcodeGetEffect, opcodeGetEffectExplicit);
+            extensions.registerInstruction ("addsoulgem", "cc", opcodeAddSoulGem, opcodeAddSoulGemExplicit);
             extensions.registerFunction ("getattacked", 'l', "", opcodeGetAttacked, opcodeGetAttackedExplicit);
             extensions.registerFunction ("getweapondrawn", 'l', "", opcodeGetWeaponDrawn, opcodeGetWeaponDrawnExplicit);
             extensions.registerFunction ("getspelleffects", 'l', "c", opcodeGetSpellEffects, opcodeGetSpellEffectsExplicit);
@@ -485,6 +516,8 @@ namespace MWScript
             interpreter.installSegment5 (opcodeGetLockedExplicit, new OpGetLocked<ExplicitRef>);
             interpreter.installSegment5 (opcodeGetEffect, new OpGetEffect<ImplicitRef>);
             interpreter.installSegment5 (opcodeGetEffectExplicit, new OpGetEffect<ExplicitRef>);
+            interpreter.installSegment5 (opcodeAddSoulGem, new OpAddSoulGem<ImplicitRef>);
+            interpreter.installSegment5 (opcodeAddSoulGemExplicit, new OpAddSoulGem<ExplicitRef>);
             interpreter.installSegment5 (opcodeGetAttacked, new OpGetAttacked<ImplicitRef>);
             interpreter.installSegment5 (opcodeGetAttackedExplicit, new OpGetAttacked<ExplicitRef>);
             interpreter.installSegment5 (opcodeGetWeaponDrawn, new OpGetWeaponDrawn<ImplicitRef>);