mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 08:23:53 +00:00
Code Issues Releases Wiki Activity

Fix moving object from an inactive to another inactive cell

Browse source
This commit is contained in:
scrawl 2014-06-24 15:29:36 +02:00
parent b52977e44c
commit 36135293e8
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -967,7 +967,7 @@ namespace MWWorld
Ogre::Vector3 vec(x, y, z);
CellStore *currCell = ptr.isInCell() ? ptr.getCell() : NULL;
CellStore *currCell = ptr.isInCell() ? ptr.getCell() : NULL; // currCell == NULL should only happen for player, during initial startup
bool isPlayer = ptr == mPlayer->getPlayer();
bool haveToMove = isPlayer || mWorldScene->isCellActive(*currCell);
@ -989,7 +989,9 @@ namespace MWWorld
}
else
{
if (!mWorldScene->isCellActive(*currCell) && mWorldScene->isCellActive(*newCell))
bool currCellActive = mWorldScene->isCellActive(*currCell);
bool newCellActive = mWorldScene->isCellActive(*newCell);
if (!currCellActive && newCellActive)
{
MWWorld::Ptr newPtr = ptr.getClass().copyToCell(ptr, *newCell, pos);
mWorldScene->addObjectToScene(newPtr);
@ -1000,7 +1002,7 @@ namespace MWWorld
}
addContainerScripts(newPtr, newCell);
}
else if (!mWorldScene->isCellActive(*newCell) && mWorldScene->isCellActive(*currCell))
else if (!newCellActive && currCellActive)
{
mWorldScene->removeObjectFromScene(ptr);
mLocalScripts.remove(ptr);
@ -1011,7 +1013,9 @@ namespace MWWorld
.copyToCell(ptr, *newCell);
newPtr.getRefData().setBaseNode(0);
}
else
else if (!currCellActive && !newCellActive)
ptr.getClass().copyToCell(ptr, *newCell);
else // both cells active
{
MWWorld::Ptr copy =
ptr.getClass().copyToCell(ptr, *newCell, pos);