mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-02 08:45:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1476 from akortunov/wanderfix

Browse source 
Fix regressions in PR1474
This commit is contained in:
scrawl 2017-09-24 14:54:25 +00:00 committed by GitHub
commit 5d1392b452
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/character.cpp
View file

@ -1892,7 +1892,7 @@ void CharacterController::update(float duration)
movestate = mMovementState; movestate = mMovementState;
} }
if(!isTurning()) if(movestate != CharState_None && !isTurning())
clearAnimQueue(); clearAnimQueue();
if(mAnimQueue.empty() || inwater || sneak) if(mAnimQueue.empty() || inwater || sneak)

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

@ -2123,6 +2123,9 @@ namespace MWWorld
bool World::isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const bool World::isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const
{ {
if (!cell)
return false;
if (!(cell->getCell()->hasWater())) { if (!(cell->getCell()->hasWater())) {
return false; return false;
} }