From e8cc098cd4303a959e69769eae2d37dd949d27d3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 11:54:39 +0200
Subject: ZVISION: Limit the engine delay, even when a custom frame rate is set

---
 engines/zvision/scripting/sidefx/animation_node.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/zvision/scripting')

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() {
-- 
cgit v1.2.3