From dba6a9ebff4ba8c3ad8b4d2cee94a5b3bf3d7212 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 17 Jul 2014 09:15:41 +0200
Subject: [PATCH] run targeted scripts with an implicit reference based on the
 ID given

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

diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 83c6560f0..332431b16 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -75,8 +75,15 @@ namespace MWScript
         {
             if (iter->second.mRunning)
             {
+                MWWorld::Ptr ptr;
+
+                if (!iter->second.mId.empty())
+                    ptr = MWBase::Environment::get().getWorld()->getPtr (
+                        iter->second.mId, false);
+
                 MWScript::InterpreterContext interpreterContext (
-                    &iter->second.mLocals, MWWorld::Ptr());
+                    &iter->second.mLocals, ptr);
+
                 MWBase::Environment::get().getScriptManager()->run (iter->first, interpreterContext);
             }
         }