mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 22:09:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'walkwhenyoucantride' into 'master'

Browse source 
Revert MR 2048

See merge request OpenMW/openmw!2175
This commit is contained in:
psi29a 2022-07-26 14:19:32 +00:00
commit d43e85051f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -28,7 +28,6 @@
Bug #5207: Loose summons can be present in scene Bug #5207: Loose summons can be present in scene
Bug #5279: Ingame console stops auto-scrolling after clicking output Bug #5279: Ingame console stops auto-scrolling after clicking output
Bug #5318: Aiescort behaves differently from vanilla Bug #5318: Aiescort behaves differently from vanilla
Bug #5371: 'Dead' slaughterfish added by mod are animated/alive
Bug #5377: Console does not appear after using menutest in inventory Bug #5377: Console does not appear after using menutest in inventory
Bug #5379: Wandering NPCs falling through cantons Bug #5379: Wandering NPCs falling through cantons
Bug #5394: Windows snapping no longer works Bug #5394: Windows snapping no longer works

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

@ -886,10 +886,12 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
{ {
/* Don't accumulate with non-actors. */ /* Don't accumulate with non-actors. */
mAnimation->setAccumulation(osg::Vec3f(0.f, 0.f, 0.f)); mAnimation->setAccumulation(osg::Vec3f(0.f, 0.f, 0.f));
mIdleState = CharState_Idle;
} }
// Update animation status for living actors // Do not update animation status for dead actors
if (mDeathState == CharState_None && cls.isActor() && !cls.getCreatureStats(mPtr).isDead()) if(mDeathState == CharState_None && (!cls.isActor() || !cls.getCreatureStats(mPtr).isDead()))
refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true); refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
mAnimation->runAnimation(0.f); mAnimation->runAnimation(0.f);