From 6083e5ed4b4e18417f7c655a3d505ba1cc423727 Mon Sep 17 00:00:00 2001 From: Capostrophic Date: Mon, 10 Dec 2018 00:04:12 +0300 Subject: [PATCH] Don't interrupt sneak and swim idles in first person view (bug #4750) --- CHANGELOG.md | 1 + apps/openmw/mwmechanics/character.cpp | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bcf6f1d2..b346f22d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Bug #4723: ResetActors command works incorrectly Bug #4745: Editor: Interior cell lighting field values are not displayed as colors Bug #4746: Non-solid player can't run or sneak + Bug #4750: Sneaking doesn't work in first person view if the player is in attack ready state Feature #2229: Improve pathfinding AI Feature #3442: Default values for fallbacks from ini file Feature #3610: Option to invert X axis diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index 07a6aa3b1..57f97aaca 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -1622,11 +1622,7 @@ bool CharacterController::updateWeaponState(CharacterState& idle) } } - // We should reset player's idle animation in the first-person mode. - if (resetIdle && mPtr == player && MWBase::Environment::get().getWorld()->isFirstPerson()) - idle = CharState_None; - - // In other cases we should not break swim and sneak animations + // We should not break swim and sneak animations if (resetIdle && idle != CharState_IdleSneak && idle != CharState_IdleSwim && mIdleState != CharState_IdleSneak && mIdleState != CharState_IdleSwim)