Avoid using null pointer for player's cell in moveObjectImp

6 years ago · 458c0bba41
parent 8754db2898
commit 458c0bba41
1 changed files with 1 additions and 1 deletions
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@ -1306,7 +1306,7 @@ namespace MWWorld

        CellStore* cell = ptr.getCell();
        CellStore* newCell = getExterior(cellX, cellY);
-        bool isCellActive = getPlayerPtr().getCell()->isExterior() && mWorldScene->isCellActive(*newCell);
+        bool isCellActive = getPlayerPtr().isInCell() && getPlayerPtr().getCell()->isExterior() && mWorldScene->isCellActive(*newCell);

        if (cell->isExterior() || (moveToActive && isCellActive && ptr.getClass().isActor()))
            cell = newCell;