Merge branch 'float' into 'master'

Allow all creatures to float to the water surface (#5790, #5758) Closes #5758 and #5790 See merge request OpenMW/openmw!534
4 years ago · abdc4cde95
parent 3e35df49df 4638fc36b4
commit abdc4cde95
1 changed files with 1 additions and 1 deletions
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@ -2448,7 +2448,7 @@ void CharacterController::update(float duration)
        }
    }

-    if (mFloatToSurface && cls.isActor() && cls.canSwim(mPtr))
+    if (mFloatToSurface && cls.isActor())
    {
        if (cls.getCreatureStats(mPtr).isDead()
            || (!godmode && cls.getCreatureStats(mPtr).isParalyzed()))