mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-03 23:56:43 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2656 from Capostrophic/sneak

Browse source 
Don't combine sneak idle with scripted/wander idles (bug #4284)
This commit is contained in:
Andrei Kortunov 2020-01-07 11:26:59 +04:00 committed by GitHub
commit 22a0549e73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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

2
apps/openmw/mwmechanics/character.cpp
View file

@ -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;