[Scummvm-cvs-logs] SF.net SVN: scummvm: [22137] scummvm/trunk/engines/simon
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Mon Apr 24 03:30:01 CEST 2006
Revision: 22137
Author: kirben
Date: 2006-04-24 03:28:48 -0700 (Mon, 24 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22137&view=rev
Log Message:
-----------
Correct and move warning, when failing to load video in FF
Modified Paths:
--------------
scummvm/trunk/engines/simon/animation.cpp
scummvm/trunk/engines/simon/items.cpp
Modified: scummvm/trunk/engines/simon/animation.cpp
===================================================================
--- scummvm/trunk/engines/simon/animation.cpp 2006-04-24 10:24:56 UTC (rev 22136)
+++ scummvm/trunk/engines/simon/animation.cpp 2006-04-24 10:28:48 UTC (rev 22137)
@@ -78,8 +78,10 @@
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 @@
}
if (_fd.isOpen() == false) {
- debug(0, "MoviePlayer::play: No file loaded");
return;
}
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp 2006-04-24 10:24:56 UTC (rev 22136)
+++ scummvm/trunk/engines/simon/items.cpp 2006-04-24 10:28:48 UTC (rev 22137)
@@ -2040,15 +2040,11 @@
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();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list