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
OpenMW · Oct 30, 2024 · 34b6a9d · 34b6a9d
2 parents 27f52d2 + 84aebcc
commit 34b6a9d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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