Skip to content

Commit

Permalink
Merge branch 'paralysisagain' into 'master'
Browse files Browse the repository at this point in the history
Don't update head animation if the animation is paused (#7980)

Closes #7980

See merge request OpenMW/openmw!4099
  • Loading branch information
jvoisin committed May 16, 2024
2 parents 2bed745 + 195599c commit cff0a26
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport
Bug #7908: Key bindings names in the settings menu are layout-specific
Bug #7943: Using "addSoulGem" and "dropSoulGem" commands to creatures works only with "Weapon & Shield" flagged ones
Bug #7980: Paralyzed NPCs' lips move
Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples
Feature #5173: Support for NiFogProperty
Expand Down
3 changes: 3 additions & 0 deletions apps/openmw/mwrender/npcanimation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ namespace MWRender
if (!mEnabled)
return;

if (dt == 0.f)
return;

if (!MWBase::Environment::get().getSoundManager()->sayActive(mReference))
{
mBlinkTimer += dt;
Expand Down

0 comments on commit cff0a26

Please sign in to comment.