diff options
| author | Filippos Karapetis | 2014-12-23 11:54:39 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-12-23 11:54:39 +0200 |
| commit | e8cc098cd4303a959e69769eae2d37dd949d27d3 (patch) | |
| tree | 4eb04d5f771693cb6ae403dc6533f7c348271bdf /engines/zvision/scripting | |
| parent | 490382098eb122e25aa895dc8de7330c22b1fcf8 (diff) | |
| download | scummvm-rg350-e8cc098cd4303a959e69769eae2d37dd949d27d3.tar.gz scummvm-rg350-e8cc098cd4303a959e69769eae2d37dd949d27d3.tar.bz2 scummvm-rg350-e8cc098cd4303a959e69769eae2d37dd949d27d3.zip | |
ZVISION: Limit the engine delay, even when a custom frame rate is set
Diffstat (limited to 'engines/zvision/scripting')
| -rw-r--r-- | engines/zvision/scripting/sidefx/animation_node.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp index 56f1fa3e49..4f26f039cc 100644 --- a/engines/zvision/scripting/sidefx/animation_node.cpp +++ b/engines/zvision/scripting/sidefx/animation_node.cpp @@ -42,13 +42,13 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S _animation = engine->loadAnimation(fileName); _frmDelay = 1000.0 / _animation->getDuration().framerate(); + if (frate > 0) + _frmDelay = 1000.0 / frate; + // WORKAROUND: We do not allow the engine to delay more than 66 msec // per frame (15fps max) if (_frmDelay > 66) _frmDelay = 66; - - if (frate > 0) - _frmDelay = 1000.0 / frate; } AnimationNode::~AnimationNode() { |