1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 00:45:32 +00:00

Avoid using null pointer for player's cell in moveObjectImp

This commit is contained in:
Capostrophic 2019-05-05 14:02:14 +03:00
parent 8754db2898
commit 458c0bba41

View file

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