[Scummvm-cvs-logs] scummvm master -> e8cc098cd4303a959e69769eae2d37dd949d27d3

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e8cc098cd4 ZVISION: Limit the engine delay, even when a custom frame rate is set


Commit: e8cc098cd4303a959e69769eae2d37dd949d27d3
    https://github.com/scummvm/scummvm/commit/e8cc098cd4303a959e69769eae2d37dd949d27d3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-23T11:54:39+02:00

Commit Message:
ZVISION: Limit the engine delay, even when a custom frame rate is set

Changed paths:
    engines/zvision/scripting/sidefx/animation_node.cpp



diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 56f1fa3..4f26f03 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() {