Merge branch 'underground' into 'master'

Get The Underground 2 running

See merge request OpenMW/openmw!608

CHANGELOG.md

@@ -1,6 +1,7 @@
 0.48.0
 ------
 
+    Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
     Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
 
 0.47.0

apps/openmw/mwscript/aiextensions.cpp

@@ -275,9 +275,11 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
-
-                    ptr.getClass().getCreatureStats(ptr).setAiSetting(mIndex, value);
-                    ptr.getClass().setBaseAISetting(ptr.getCellRef().getRefId(), mIndex, value);
+                    if(ptr.getClass().isActor())
+                    {
+                        ptr.getClass().getCreatureStats(ptr).setAiSetting(mIndex, value);
+                        ptr.getClass().setBaseAISetting(ptr.getCellRef().getRefId(), mIndex, value);
+                    }
                 }
         };
 

apps/openmw/mwscript/containerextensions.cpp

@@ -308,7 +308,8 @@ namespace MWScript
                     }
                     if (it == invStore.end())
                     {
-                        it = ptr.getClass().getContainerStore (ptr).add (item, 1, ptr);
+                        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), item, 1);
+                        it = ptr.getClass().getContainerStore (ptr).add (ref.getPtr(), 1, ptr, false);
                         Log(Debug::Warning) << "Implicitly adding one " << item << 
                             " to the inventory store of " << ptr.getCellRef().getRefId() <<
                             " to fulfill the requirements of Equip instruction";

apps/openmw/mwscript/globalscripts.cpp

@@ -92,6 +92,21 @@ namespace
             return false;
         }
     };
+
+    struct IdGettingVisitor : public boost::static_visitor<std::string>
+    {
+        std::string operator()(const MWWorld::Ptr& ptr) const
+        {
+            if(ptr.isEmpty())
+                return {};
+            return ptr.mRef->mRef.getRefId();
+        }
+
+        std::string operator()(const std::pair<ESM::RefNum, std::string>& pair) const
+        {
+            return pair.second;
+        }
+    };
 }
 
 namespace MWScript
@@ -110,6 +125,11 @@ namespace MWScript
         return ptr;
     }
 
+    std::string GlobalScriptDesc::getId() const
+    {
+        return boost::apply_visitor(IdGettingVisitor(), mTarget);
+    }
+
 
     GlobalScripts::GlobalScripts (const MWWorld::ESMStore& store)
     : mStore (store)

apps/openmw/mwscript/globalscripts.hpp

@@ -44,6 +44,8 @@ namespace MWScript
         const MWWorld::Ptr* getPtrIfPresent() const; // Returns a Ptr if one has been resolved
 
         MWWorld::Ptr getPtr(); // Resolves mTarget to a Ptr and caches the (potentially empty) result
+
+        std::string getId() const; // Returns the target's ID -- if any
     };
 
     class GlobalScripts

apps/openmw/mwscript/interpretercontext.cpp

@@ -129,6 +129,15 @@ namespace MWScript
             mGlobalScriptDesc = globalScriptDesc;
     }
 
+    std::string InterpreterContext::getTarget() const
+    {
+        if(!mReference.isEmpty())
+            return mReference.mRef->mRef.getRefId();
+        else if(mGlobalScriptDesc)
+            return mGlobalScriptDesc->getId();
+        return {};
+    }
+
     int InterpreterContext::getLocalShort (int index) const
     {
         if (!mLocals)
@@ -474,7 +483,7 @@ namespace MWScript
         locals.mFloats[findLocalVariableIndex (scriptId, name, 'f')] = value;
     }
 
-    MWWorld::Ptr InterpreterContext::getReference(bool required)
+    MWWorld::Ptr InterpreterContext::getReference(bool required) const
     {
         return getReferenceImp ("", true, required);
     }

apps/openmw/mwscript/interpretercontext.hpp

@@ -47,6 +47,8 @@ namespace MWScript
             InterpreterContext (MWScript::Locals *locals, const MWWorld::Ptr& reference);
             ///< The ownership of \a locals is not transferred. 0-pointer allowed.
 
+            std::string getTarget() const override;
+
             int getLocalShort (int index) const override;
 
             int getLocalLong (int index) const override;
@@ -124,7 +126,7 @@ namespace MWScript
 
             void setMemberFloat (const std::string& id, const std::string& name, float value, bool global) override;
 
-            MWWorld::Ptr getReference(bool required=true);
+            MWWorld::Ptr getReference(bool required=true) const;
             ///< Reference, that the script is running from (can be empty)
 
             void updatePtr(const MWWorld::Ptr& base, const MWWorld::Ptr& updated);

apps/openmw/mwscript/scriptmanagerimp.cpp

@@ -109,7 +109,8 @@ namespace MWScript
         }
 
         // execute script
-        if (!iter->second.mByteCode.empty() && iter->second.mActive)
+        std::string target = Misc::StringUtils::lowerCase(interpreterContext.getTarget());
+        if (!iter->second.mByteCode.empty() && iter->second.mInactive.find(target) == iter->second.mInactive.end())
             try
             {
                 if (!mOpcodesInstalled)
@@ -129,7 +130,7 @@ namespace MWScript
             {
                 Log(Debug::Error) << "Execution of script " << name << " failed: "  << e.what();
 
-                iter->second.mActive = false; // don't execute again.
+                iter->second.mInactive.insert(target); // don't execute again.
             }
         return false;
     }
@@ -138,7 +139,7 @@ namespace MWScript
     {
         for (auto& script : mScripts)
         {
-            script.second.mActive = true;
+            script.second.mInactive.clear();
         }
 
         mGlobalScripts.clear();

apps/openmw/mwscript/scriptmanagerimp.hpp

@@ -2,6 +2,7 @@
 #define GAME_SCRIPT_SCRIPTMANAGER_H
 
 #include <map>
+#include <set>
 #include <string>
 
 #include <components/compiler/streamerrorhandler.hpp>
@@ -45,13 +46,12 @@ namespace MWScript
             {
                 std::vector<Interpreter::Type_Code> mByteCode;
                 Compiler::Locals mLocals;
-                bool mActive;
+                std::set<std::string> mInactive;
 
                 CompiledScript(const std::vector<Interpreter::Type_Code>& code, const Compiler::Locals& locals)
                 {
                     mByteCode = code;
                     mLocals = locals;
-                    mActive = true;
                 }
             };
 

components/interpreter/context.hpp

@@ -12,6 +12,8 @@ namespace Interpreter
 
             virtual ~Context() {}
 
+            virtual std::string getTarget() const = 0;
+
             virtual int getLocalShort (int index) const = 0;
 
             virtual int getLocalLong (int index) const = 0;