mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-26 02:38:04 +00:00
Code Issues Projects Releases Wiki Activity

Update effects even when main animation is paused (Fixes #1585)

Browse Source
This commit is contained in:
scrawl 2014-06-28 17:54:14 +02:00
parent f929004635
commit 10ef0a34d9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1449,6 +1449,8 @@ void CharacterController::update(float duration)
if(mMovementAnimVelocity > 0) if(mMovementAnimVelocity > 0)
world->queueMovement(mPtr, moved); world->queueMovement(mPtr, moved);
} }
else if (mAnimation)
mAnimation->updateEffects(duration);
mSkipAnim = false; mSkipAnim = false;
} }

6
apps/openmw/mwrender/animation.hpp
View File

@ -226,9 +226,6 @@ public:
virtual void preRender (Ogre::Camera* camera); virtual void preRender (Ogre::Camera* camera);
virtual void setAlpha(float alpha) {} virtual void setAlpha(float alpha) {}
private:
void updateEffects(float duration);
public: public:
void updatePtr(const MWWorld::Ptr &ptr); void updatePtr(const MWWorld::Ptr &ptr);
@ -301,6 +298,9 @@ public:
virtual Ogre::Vector3 runAnimation(float duration); virtual Ogre::Vector3 runAnimation(float duration);
/// This is typically called as part of runAnimation, but may be called manually if needed.
void updateEffects(float duration);
virtual void showWeapons(bool showWeapon); virtual void showWeapons(bool showWeapon);
virtual void showCarriedLeft(bool show) {} virtual void showCarriedLeft(bool show) {}
virtual void attachArrow() {} virtual void attachArrow() {}