|
|
@ -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)
|
|
|
|