teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

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

Browse source
This commit is contained in:
Capostrophic 2018-07-08 23:08:57 +03:00 committed by GitHub
parent caad14093e
commit 14d3b213a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwworld/worldimp.cpp
View file

@ -1166,7 +1166,10 @@ namespace MWWorld
if (isPlayer) if (isPlayer)
{ {
if (!newCell->isExterior()) if (!newCell->isExterior())
{
changeToInteriorCell(Misc::StringUtils::lowerCase(newCell->getCell()->mName), pos, false); changeToInteriorCell(Misc::StringUtils::lowerCase(newCell->getCell()->mName), pos, false);
removeContainerScripts(getPlayerPtr());
}
else else
{ {
if (mWorldScene->isCellActive(*newCell)) if (mWorldScene->isCellActive(*newCell))
@ -1187,9 +1190,8 @@ namespace MWWorld
mWorldScene->addObjectToScene(newPtr); mWorldScene->addObjectToScene(newPtr);
std::string script = newPtr.getClass().getScript(newPtr); std::string script = newPtr.getClass().getScript(newPtr);
if (!script.empty()) { if (!script.empty())
mLocalScripts.add(script, newPtr); mLocalScripts.add(script, newPtr);
}
addContainerScripts(newPtr, newCell); addContainerScripts(newPtr, newCell);
} }
else if (!newCellActive && currCellActive) else if (!newCellActive && currCellActive)