Closes #1065: Don't apply fall damage when landing in water

11 years ago · 17ff8165d2
parent 2a8ab932ef
commit 17ff8165d2
1 changed files with 4 additions and 1 deletions
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@ -802,6 +802,9 @@ void CharacterController::update(float duration)
        if(sneak || inwater || flying)
            vec.z = 0.0f;

+        if (inwater || flying)
+            cls.getCreatureStats(mPtr).land();
+
        if(!onground && !flying && !inwater)
        {
            // In the air (either getting up —ascending part of jump— or falling).
@ -925,7 +928,7 @@ void CharacterController::update(float duration)
            }
        }

-        if (onground || inwater || flying)
+        if (onground)
            cls.getCreatureStats(mPtr).land();

        if(movestate != CharState_None)