diff options
| author | Torbjörn Andersson | 2010-01-08 19:58:47 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-01-08 19:58:47 +0000 |
| commit | 3a163b960e70ce4d56db56312fdb3957b7f0ee5b (patch) | |
| tree | a78fd3933bec8ba5a9a866ad829e780bcf8fe7f7 /engines | |
| parent | ae3dc2ddba6b5e6354de7e8b5e4124e35d221390 (diff) | |
| download | scummvm-rg350-3a163b960e70ce4d56db56312fdb3957b7f0ee5b.tar.gz scummvm-rg350-3a163b960e70ce4d56db56312fdb3957b7f0ee5b.tar.bz2 scummvm-rg350-3a163b960e70ce4d56db56312fdb3957b7f0ee5b.zip | |
This should fix bug #2928411, "SWORD1: Macintosh Demo crashes after Intro".
svn-id: r47171
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sword1/sound.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index d8e664fed3..30e12cda93 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -222,7 +222,7 @@ bool Sound::speechFinished() { void Sound::newScreen(uint32 screen) { if (_currentCowFile != SwordEngine::_systemVars.currentCD) { - if (_currentCowFile) + if (_cowFile.isOpen()) closeCowSystem(); initCowSystem(); } @@ -545,6 +545,9 @@ void Sound::stopSpeech() { } void Sound::initCowSystem() { + if (SwordEngine::_systemVars.currentCD == 0) + return; + char cowName[25]; /* look for speech1/2.clu in the data dir and speech/speech.clu (running from cd or using cd layout) |