aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-05-24 03:56:48 +0000
committerTorbjörn Andersson2006-05-24 03:56:48 +0000
commit2f51f40c1189de161824f15f29f00e072f3c43ec (patch)
tree3b48ec9708b87eea7048b70a12bfbb543d1a68dd /engines/scumm
parentd9d3b604f28746acba0553e107538d9288e1fa85 (diff)
downloadscummvm-rg350-2f51f40c1189de161824f15f29f00e072f3c43ec.tar.gz
scummvm-rg350-2f51f40c1189de161824f15f29f00e072f3c43ec.tar.bz2
scummvm-rg350-2f51f40c1189de161824f15f29f00e072f3c43ec.zip
Downgraded startHETalkSound() error (when the speech file isn't open) to a
warning, since it happens on the Pajama Sam's Lost & Found demo's main menu screen. svn-id: r22593
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/sound_he.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 23224354c0..9a039b0008 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -652,7 +652,9 @@ void SoundHE::startHETalkSound(uint32 offset) {
assert(_sfxFile);
if (!_sfxFile->isOpen()) {
- error("startHETalkSound: Speech file is not open");
+ // This happens in the Pajama Sam's Lost & Found demo, on the
+ // main menu screen, so don't make it a fatal error.
+ warning("startHETalkSound: Speech file is not open");
return;
}