mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-16 16:20:53 +00:00
Revert MR 2048
This commit is contained in:
parent
ea9f2761c3
commit
bbb8a5e1cb
@ -28,7 +28,6 @@
|
||||
Bug #5207: Loose summons can be present in scene
|
||||
Bug #5279: Ingame console stops auto-scrolling after clicking output
|
||||
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 #5379: Wandering NPCs falling through cantons
|
||||
Bug #5394: Windows snapping no longer works
|
||||
|
@ -886,10 +886,12 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
|
||||
{
|
||||
/* Don't accumulate with non-actors. */
|
||||
mAnimation->setAccumulation(osg::Vec3f(0.f, 0.f, 0.f));
|
||||
|
||||
mIdleState = CharState_Idle;
|
||||
}
|
||||
|
||||
// Update animation status for living actors
|
||||
if (mDeathState == CharState_None && cls.isActor() && !cls.getCreatureStats(mPtr).isDead())
|
||||
// Do not update animation status for dead actors
|
||||
if(mDeathState == CharState_None && (!cls.isActor() || !cls.getCreatureStats(mPtr).isDead()))
|
||||
refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
|
||||
|
||||
mAnimation->runAnimation(0.f);
|
||||
|
Loading…
x
Reference in New Issue
Block a user