From d088729a8c21570c13fb85a17abd34eaeef50011 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 24 Apr 2006 10:28:48 +0000
Subject: Correct and move warning, when failing to load video in FF

svn-id: r22137
---
 engines/simon/animation.cpp | 5 +++--
 engines/simon/items.cpp     | 6 +-----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'engines/simon')

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();
 }
 
-- 
cgit v1.2.3