aboutsummaryrefslogtreecommitdiff
path: root/engines/zvision/animation/meta_animation.cpp
diff options
context:
space:
mode:
authorMarisa-Chan2014-09-09 12:31:11 +0700
committerMarisa-Chan2014-09-09 12:31:11 +0700
commit78552afdae3b7b27845d7ea4d2c2638fa3182333 (patch)
tree046d867fd74e254308df62afe54df0838b76967e /engines/zvision/animation/meta_animation.cpp
parent2b6d65f83bdc26b3d07cfc3061a27882d87df67c (diff)
downloadscummvm-rg350-78552afdae3b7b27845d7ea4d2c2638fa3182333.tar.gz
scummvm-rg350-78552afdae3b7b27845d7ea4d2c2638fa3182333.tar.bz2
scummvm-rg350-78552afdae3b7b27845d7ea4d2c2638fa3182333.zip
ZVISION: Check .avi and .rlf suffix only in MetaAnimation.
Diffstat (limited to 'engines/zvision/animation/meta_animation.cpp')
-rw-r--r--engines/zvision/animation/meta_animation.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp
index 38f56699bb..1ea6df6481 100644
--- a/engines/zvision/animation/meta_animation.cpp
+++ b/engines/zvision/animation/meta_animation.cpp
@@ -40,14 +40,16 @@ namespace ZVision {
MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)
: _fileType(RLF),
_cur_frame(NULL) {
- if (fileName.hasSuffix(".rlf")) {
+ Common::String tmpFileName = fileName;
+ tmpFileName.toLowercase();
+ if (tmpFileName.hasSuffix(".rlf")) {
_fileType = RLF;
- Common::File *_file = engine->getSearchManager()->openFile(fileName);
+ Common::File *_file = engine->getSearchManager()->openFile(tmpFileName);
_animation.rlf = new RlfAnimation(_file, false);
_frmDelay = _animation.rlf->frameTime();
- } else if (fileName.hasSuffix(".avi")) {
+ } else if (tmpFileName.hasSuffix(".avi")) {
_fileType = AVI;
- Common::File *_file = engine->getSearchManager()->openFile(fileName);
+ Common::File *_file = engine->getSearchManager()->openFile(tmpFileName);
_animation.avi = new ZorkAVIDecoder();
_animation.avi->loadStream(_file);
_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();