From 55c5d7cee445bf7ae83580370f3b11c1694f44f6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 3 Jan 2014 15:54:23 +0100
Subject: [PATCH] Implement Resurrect instruction

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

diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 6fc8f2597..a21796ce6 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -266,8 +266,10 @@ namespace MWMechanics
         if (mDead)
         {
             if (mDynamic[0].getCurrent()<1)
-                mDynamic[0].setCurrent (1);
-
+            {
+                mDynamic[0].setModified(mDynamic[0].getModified(), 1);
+                mDynamic[0].setCurrent(1);
+            }
             if (mDynamic[0].getCurrent()>=1)
                 mDead = false;
         }
diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index cf27b7d6e..40377327a 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -366,4 +366,6 @@ op 0x200022b: RemoveSpellEffects
 op 0x200022c: RemoveSpellEffects, explicit
 op 0x200022d: RemoveEffects
 op 0x200022e: RemoveEffects, explicit
+op 0x200022f: Resurrect
+op 0x2000230: Resurrect, explicit
 opcodes 0x200022f-0x3ffffff unused
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index b1c9698ca..f053e9a97 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1104,6 +1104,18 @@ namespace MWScript
                 }
         };
 
+        template <class R>
+        class OpResurrect : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+                    ptr.getClass().getCreatureStats(ptr).resurrect();
+                }
+        };
+
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
             for (int i=0; i<Compiler::Stats::numberOfAttributes; ++i)
@@ -1170,7 +1182,9 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpellEffects, new OpRemoveSpellEffects<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Stats::opcodeRemoveSpellEffectsExplicit,
                 new OpRemoveSpellEffects<ExplicitRef>);
-
+            interpreter.installSegment5 (Compiler::Stats::opcodeResurrect, new OpResurrect<ImplicitRef>);
+            interpreter.installSegment5 (Compiler::Stats::opcodeResurrectExplicit,
+                new OpResurrect<ExplicitRef>);
             interpreter.installSegment5 (Compiler::Stats::opcodeRemoveEffects, new OpRemoveEffects<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Stats::opcodeRemoveEffectsExplicit,
                 new OpRemoveEffects<ExplicitRef>);
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index c113a3275..ceffa4c9a 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -395,6 +395,8 @@ namespace Compiler
                 opcodeRemoveSpellEffectsExplicit);
             extensions.registerInstruction ("removeeffects", "l", opcodeRemoveEffects,
                 opcodeRemoveEffectsExplicit);
+            extensions.registerInstruction ("resurrect", "", opcodeResurrect,
+                opcodeResurrectExplicit);
             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 4cd9ec3ff..a211f167a 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -374,6 +374,8 @@ namespace Compiler
         const int opcodeRemoveSpellEffectsExplicit = 0x200022c;
         const int opcodeRemoveEffects = 0x200022d;
         const int opcodeRemoveEffectsExplicit = 0x200022e;
+        const int opcodeResurrect = 0x200022f;
+        const int opcodeResurrectExplicit = 0x2000230;
     }
 
     namespace Transformation