mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-05 15:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1485 from akortunov/master

Browse Source 
Fix a failed assert in the getCell() check during a new game start
This commit is contained in:
scrawl 2017-09-29 22:53:10 +00:00 committed by GitHub
commit 841990fcdb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwworld/worldimp.cpp
View File

@ -2118,7 +2118,9 @@ namespace MWWorld
pos.z() += heightRatio*2*mPhysics->getRenderingHalfExtents(object).z();
return isUnderwater(object.getCell(), pos);
const CellStore *currCell = object.isInCell() ? object.getCell() : NULL; // currCell == NULL should only happen for player, during initial startup
return isUnderwater(currCell, pos);
}
bool World::isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const