Merge remote-tracking branch 'zini/master' into animation2

apps/openmw/mwscript/scriptmanagerimp.cpp

@@ -140,25 +140,42 @@ namespace MWScript
 
     Compiler::Locals& ScriptManager::getLocals (const std::string& name)
     {
-        ScriptCollection::iterator iter = mScripts.find (name);
-
-        if (iter==mScripts.end())
         {
-            if (!compile (name))
+            ScriptCollection::iterator iter = mScripts.find (name);
-            {
-                /// \todo Handle case of cyclic member variable access. Currently this could look up
-                /// the whole application in an endless recursion.
 
-                // failed -> ignore script from now on.
+            if (iter!=mScripts.end())
-                std::vector<Interpreter::Type_Code> empty;
+                return iter->second.second;
-                mScripts.insert (std::make_pair (name, std::make_pair (empty, Compiler::Locals())));
-                throw std::runtime_error ("failed to compile script " + name);
-            }
-
-            iter = mScripts.find (name);
         }
 
-        return iter->second.second;
+        {
+            std::map<std::string, Compiler::Locals>::iterator iter = mOtherLocals.find (name);
+
+            if (iter!=mOtherLocals.end())
+                return iter->second;
+        }
+
+        Compiler::Locals locals;
+
+        if (const ESM::Script *script = mStore.get<ESM::Script>().find (name))
+        {
+            int index = 0;
+
+            for (int i=0; i<script->mData.mNumShorts; ++i)
+                locals.declare ('s', script->mVarNames[index++]);
+
+            for (int i=0; i<script->mData.mNumLongs; ++i)
+                locals.declare ('l', script->mVarNames[index++]);
+
+            for (int i=0; i<script->mData.mNumFloats; ++i)
+                locals.declare ('f', script->mVarNames[index++]);
+
+            std::map<std::string, Compiler::Locals>::iterator iter =
+                mOtherLocals.insert (std::make_pair (name, locals)).first;
+
+            return iter->second;
+        }
+
+        throw std::logic_error ("script " + name + " does not exist");
     }
 
     GlobalScripts& ScriptManager::getGlobalScripts()

apps/openmw/mwscript/scriptmanagerimp.hpp

@@ -47,6 +47,7 @@ namespace MWScript
 
             ScriptCollection mScripts;
             GlobalScripts mGlobalScripts;
+            std::map<std::string, Compiler::Locals> mOtherLocals;
 
         public:
 

apps/openmw/mwworld/store.hpp

@@ -19,7 +19,7 @@ namespace MWWorld
 
         virtual size_t getSize() const = 0;
         virtual void load(ESM::ESMReader &esm, const std::string &id) = 0;
-        
+
         virtual bool eraseStatic(const std::string &id) {return false;}
     };
 
@@ -110,7 +110,7 @@ namespace MWWorld
             item.mId = Misc::StringUtils::lowerCase(id);
 
             typename std::map<std::string, T>::const_iterator it = mStatic.find(item.mId);
-            
+
             if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {
                 return &(it->second);
             }
@@ -188,14 +188,14 @@ namespace MWWorld
             item.mId = Misc::StringUtils::lowerCase(id);
 
             typename std::map<std::string, T>::iterator it = mStatic.find(item.mId);
-            
+
             if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {
                 mStatic.erase(it);
             }
 
             return true;
         }
-        
+
         bool erase(const std::string &id) {
             std::string key = Misc::StringUtils::lowerCase(id);
             typename Dynamic::iterator it = mDynamic.find(key);
@@ -220,9 +220,15 @@ namespace MWWorld
     template <>
     inline void Store<ESM::Dialogue>::load(ESM::ESMReader &esm, const std::string &id) {
         std::string idLower = Misc::StringUtils::lowerCase(id);
-        mStatic[idLower] = ESM::Dialogue();
+
-        mStatic[idLower].mId = id; // don't smash case here, as this line is printed... I think
+        std::map<std::string, ESM::Dialogue>::iterator it = mStatic.find(idLower);
-        mStatic[idLower].load(esm);
+        if (it == mStatic.end()) {
+            it = mStatic.insert( std::make_pair( idLower, ESM::Dialogue() ) ).first;
+            it->second.mId = id; // don't smash case here, as this line is printed... I think
+        }
+
+        //I am not sure is it need to load the dialog from a plugin if it was already loaded from prevois plugins
+        it->second.load(esm);
     }
 
     template <>
@@ -409,7 +415,7 @@ namespace MWWorld
 
         DynamicInt mDynamicInt;
         DynamicExt mDynamicExt;
-        
+
         const ESM::Cell *search(const ESM::Cell &cell) const {
             if (cell.isExterior()) {
                 return search(cell.getGridX(), cell.getGridY());
@@ -481,7 +487,7 @@ namespace MWWorld
             newCell->mData.mY = y;
             mExt[std::make_pair(x, y)] = *newCell;
             delete newCell;
-            
+
             return &mExt[std::make_pair(x, y)];
         }
 
@@ -528,7 +534,7 @@ namespace MWWorld
         //  There some nasty three-way cyclic header dependency involved, which I could only fix by moving
         //  this method.
         void load(ESM::ESMReader &esm, const std::string &id);
-        
+
         iterator intBegin() const {
             return iterator(mSharedInt.begin());
         }