From 78552afdae3b7b27845d7ea4d2c2638fa3182333 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 9 Sep 2014 12:31:11 +0700
Subject: ZVISION: Check .avi and .rlf suffix only in MetaAnimation.

---
 engines/zvision/scripting/controls/hotmov_control.cpp | 3 +--
 engines/zvision/scripting/controls/lever_control.cpp  | 3 +--
 engines/zvision/scripting/controls/safe_control.cpp   | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'engines/zvision/scripting/controls')

diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index 1e1886e1a8..8ffc3392be 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -80,8 +80,7 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 			char filename[64];
 			sscanf(values.c_str(), "%s", filename);
 			values = Common::String(filename);
-			if (values.hasSuffix(".avi") || values.hasSuffix(".rlf"))
-				_animation = new MetaAnimation(values, _engine);
+			_animation = new MetaAnimation(values, _engine);
 		} else if (param.matchString("venus_id", true)) {
 			_venus_id = atoi(values.c_str());
 		}
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 87fbb433dd..8072079435 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -104,8 +104,7 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 
 			Common::String animationFileName(fileNameBuffer);
 
-			if (animationFileName.hasSuffix(".avi") || animationFileName.hasSuffix(".rlf"))
-				_animation = new MetaAnimation(animationFileName, _engine);
+			_animation = new MetaAnimation(animationFileName, _engine);
 
 		} else if (line.matchString("*skipcolor*", true)) {
 			// Not used
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index a6be20bce8..d5eff09502 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -66,8 +66,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 	while (!stream.eos() && !line.contains('}')) {
 		if (param.matchString("animation", true)) {
-			if (values.hasSuffix(".avi") || values.hasSuffix(".rlf"))
-				_animation = new MetaAnimation(values, _engine);
+			_animation = new MetaAnimation(values, _engine);
 		} else if (param.matchString("rectangle", true)) {
 			int x;
 			int y;
-- 
cgit v1.2.3