Merge branch 'howdidabdufindthis' into 'master'

Don't assign vertical movement for inert characters out of water (#7968) Closes #7968 See merge request OpenMW/openmw!4432
2 months ago · 34b6a9d402
parent 27f52d27b9 84aebccbb0
commit 34b6a9d402
1 changed files with 1 additions and 1 deletions
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@ -2475,7 +2475,7 @@ namespace MWMechanics
                movement = osg::Vec3f();
            }

-            if (mFloatToSurface)
+            if (mFloatToSurface && world->isSwimming(mPtr))
            {
                if (cls.getCreatureStats(mPtr).isDead()
                    || (!godmode