From 29c6a8975a8c47c6efb717080688fe23b8cb5e8a Mon Sep 17 00:00:00 2001 From: capostrophic Date: Sun, 5 Jan 2020 15:09:02 +0300 Subject: [PATCH] Don't combine sneak idle with scripted/wander idles (bug #4284) --- CHANGELOG.md | 1 + apps/openmw/mwmechanics/character.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b344438094..148135c6e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ Bug #4262: Rain settings are hardcoded Bug #4270: Closing doors while they are obstructed desyncs closing sfx Bug #4276: Resizing character window differs from vanilla + Bug #4284: ForceSneak behaviour is inconsistent if the target has AiWander package Bug #4329: Removed birthsign abilities are restored after reloading the save Bug #4341: Error message about missing GDB is too vague Bug #4383: Bow model obscures crosshair when arrow is drawn diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index fa3fe4bd29..0c13c27408 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -2249,7 +2249,7 @@ void CharacterController::update(float duration, bool animationOnly) if(movestate != CharState_None && !isTurning()) clearAnimQueue(); - if(mAnimQueue.empty() || inwater || sneak) + if(mAnimQueue.empty() || inwater || (sneak && mIdleState != CharState_SpecialIdle)) { if (inwater) idlestate = CharState_IdleSwim;