diff options
| author | Sylvain Dupont | 2010-10-10 23:10:14 +0000 |
|---|---|---|
| committer | Sylvain Dupont | 2010-10-10 23:10:14 +0000 |
| commit | ce97c61079a67317998195415eba4384ad28b12d (patch) | |
| tree | 10904904afef795f3d12c0a6853e3ffc98a51592 /engines/toon/audio.cpp | |
| parent | 426d6749cf534dec673e958f98711ac64a04f9a6 (diff) | |
| download | scummvm-rg350-ce97c61079a67317998195415eba4384ad28b12d.tar.gz scummvm-rg350-ce97c61079a67317998195415eba4384ad28b12d.tar.bz2 scummvm-rg350-ce97c61079a67317998195415eba4384ad28b12d.zip | |
TOON: Fixed offsets in hard coded conversation musics
svn-id: r53144
Diffstat (limited to 'engines/toon/audio.cpp')
| -rw-r--r-- | engines/toon/audio.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp index ed22186a49..ac92418e81 100644 --- a/engines/toon/audio.cpp +++ b/engines/toon/audio.cpp @@ -70,6 +70,10 @@ void AudioManager::playMusic(Common::String dir, Common::String music) { _currentMusicName = music; + Common::SeekableReadStream *srs = _vm->resources()->openFile(path); + if (!srs) + return; + // see what channel to take if (_channels[0] && _channels[0]->isPlaying() && _channels[1] && _channels[1]->isPlaying()) { // take the one that is fading @@ -91,7 +95,7 @@ void AudioManager::playMusic(Common::String dir, Common::String music) { _currentMusicChannel = 0; } - Common::SeekableReadStream *srs = _vm->resources()->openFile(path); + //if (!_channels[_currentMusicChannel]) // delete _channels[_currentMusicChannel]; _channels[_currentMusicChannel] = new AudioStreamInstance(this, _mixer, srs, true); |