diff options
author | Travis Howell | 2006-04-24 10:28:48 +0000 |
---|---|---|
committer | Travis Howell | 2006-04-24 10:28:48 +0000 |
commit | d088729a8c21570c13fb85a17abd34eaeef50011 (patch) | |
tree | a10ebb49cfd282b660e88d73ac5accab16d3b4e2 /engines/simon | |
parent | 8632282db31ace6d7be32f5c733a08974e33b2ad (diff) | |
download | scummvm-rg350-d088729a8c21570c13fb85a17abd34eaeef50011.tar.gz scummvm-rg350-d088729a8c21570c13fb85a17abd34eaeef50011.tar.bz2 scummvm-rg350-d088729a8c21570c13fb85a17abd34eaeef50011.zip |
Correct and move warning, when failing to load video in FF
svn-id: r22137
Diffstat (limited to 'engines/simon')
-rw-r--r-- | engines/simon/animation.cpp | 5 | ||||
-rw-r--r-- | engines/simon/items.cpp | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/engines/simon/animation.cpp b/engines/simon/animation.cpp index bc056cb51e..e4353c9815 100644 --- a/engines/simon/animation.cpp +++ b/engines/simon/animation.cpp @@ -78,8 +78,10 @@ bool MoviePlayer::load(const char *filename) { filename2[len++] = 'x'; filename2[len++] = 'a'; - if (_fd.open(filename2) == false) + if (_fd.open(filename2) == false) { + warning("Failed to load video file %s", filename2); return false; + } tag = _fd.readUint32BE(); assert(tag == MKID_BE('DEXA')); @@ -130,7 +132,6 @@ void MoviePlayer::play() { } if (_fd.isOpen() == false) { - debug(0, "MoviePlayer::play: No file loaded"); return; } diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index 75c06faf2a..5097467ac6 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -2040,15 +2040,11 @@ void SimonEngine::o3_mouseOff() { void SimonEngine::o3_loadVideo() { // 182: load video file const byte *filename = getStringPtrByID(getNextStringID()); - debug(0, "Load video %s", filename); - - if (_moviePlay->load((const char *)filename) == false) - warning("Failed to load video file %s", filename); + _moviePlay->load((const char *)filename); } void SimonEngine::o3_playVideo() { // 183: play video - debug(0, "Play video"); _moviePlay->play(); } |