From 6a3ff211b18cbf5505dfb6f06a554aac4cf8355d Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 18 Jul 2014 09:57:47 +0200
Subject: [PATCH] automatically get target ID at InterpreterContext
 construction, if a reference is available

---
 apps/openmw/mwscript/interpretercontext.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index c64b4c0d37..e1dc6273c1 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -107,7 +107,13 @@ namespace MWScript
         MWScript::Locals *locals, MWWorld::Ptr reference, const std::string& targetId)
     : mLocals (locals), mReference (reference),
       mActivationHandled (false), mTargetId (targetId)
-    {}
+    {
+        // If we run on a reference (local script, dialogue script or console with object
+        // selected), store the ID of that reference store it so it can be inherited by
+        // targeted scripts started from this one.
+        if (targetId.empty() && !reference.isEmpty())
+            mTargetId = reference.getClass().getId (reference);
+    }
 
     int InterpreterContext::getLocalShort (int index) const
     {