diff options
Diffstat (limited to 'engines/zvision/scripting')
4 files changed, 5 insertions, 12 deletions
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; diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp index 4a606adc9e..bd9c543d52 100644 --- a/engines/zvision/scripting/sidefx/animation_node.cpp +++ b/engines/zvision/scripting/sidefx/animation_node.cpp @@ -40,12 +40,8 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S _mask(mask), _animation(NULL) { - if (fileName.hasSuffix(".rlf") || fileName.hasSuffix(".avi")) { - _animation = new MetaAnimation(fileName, engine); - _frmDelay = _animation->frameTime(); - } else { - warning("Unrecognized animation file type: %s", fileName.c_str()); - } + _animation = new MetaAnimation(fileName, engine); + _frmDelay = _animation->frameTime(); if (frate > 0) _frmDelay = 1000.0 / frate; |