Merge branch 'wet_and_sneaky' into 'master'

Don't consider underwater sneaking to be sneaking See merge request OpenMW/openmw!1490
3 years ago · 46564f08ad
parent 97d285d1c1 a2964f2244
commit 46564f08ad
1 changed files with 1 additions and 1 deletions
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@ -1944,7 +1944,7 @@ void CharacterController::update(float duration)
        bool flying = world->isFlying(mPtr);
        bool solid = world->isActorCollisionEnabled(mPtr);
        // Can't run and sneak while flying (see speed formula in Npc/Creature::getSpeed)
-        bool sneak = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Sneak) && !flying;
+        bool sneak = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Sneak) && !flying && !inwater;
        bool isrunning = cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run) && !flying;
        CreatureStats &stats = cls.getCreatureStats(mPtr);
        Movement& movementSettings = cls.getMovementSettings(mPtr);