Fix double call of addContainerScripts on player in moveObject (fixes #4490)

7 years ago · 14d3b213a1
parent caad14093e
commit 14d3b213a1
1 changed files with 4 additions and 2 deletions
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@ -1166,7 +1166,10 @@ namespace MWWorld
            if (isPlayer)
            {
                if (!newCell->isExterior())
+                {
                    changeToInteriorCell(Misc::StringUtils::lowerCase(newCell->getCell()->mName), pos, false);
+                    removeContainerScripts(getPlayerPtr());
+                }
                else
                {
                    if (mWorldScene->isCellActive(*newCell))
@ -1187,9 +1190,8 @@ namespace MWWorld
                    mWorldScene->addObjectToScene(newPtr);

                    std::string script = newPtr.getClass().getScript(newPtr);
-                    if (!script.empty()) {
+                    if (!script.empty())
                        mLocalScripts.add(script, newPtr);
-                    }
                    addContainerScripts(newPtr, newCell);
                }
                else if (!newCellActive && currCellActive)