diff options
| author | Norbert Lange | 2009-06-19 22:13:43 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-06-19 22:13:43 +0000 |
| commit | 115c276d4c0e34e73af14a16abd1a7fe0df63051 (patch) | |
| tree | 3beaa354cb51c2016eed7f64e9db5f8925625987 /engines/scumm/player_v4a.cpp | |
| parent | 3ef2279c343d9bc671a8173c33051d99d9d47e09 (diff) | |
| download | scummvm-rg350-115c276d4c0e34e73af14a16abd1a7fe0df63051.tar.gz scummvm-rg350-115c276d4c0e34e73af14a16abd1a7fe0df63051.tar.bz2 scummvm-rg350-115c276d4c0e34e73af14a16abd1a7fe0df63051.zip | |
modified doSong so you can start a new Song without killing running macros
svn-id: r41693
Diffstat (limited to 'engines/scumm/player_v4a.cpp')
| -rw-r--r-- | engines/scumm/player_v4a.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/scumm/player_v4a.cpp b/engines/scumm/player_v4a.cpp index 7dddffe0ad..fadb456694 100644 --- a/engines/scumm/player_v4a.cpp +++ b/engines/scumm/player_v4a.cpp @@ -82,7 +82,8 @@ void Player_V4A::stopAllSounds() { void Player_V4A::stopSound(int nr) { if (nr == _musicId) { - _mixer->stopHandle(_musicHandle); + _tfmxPlay->stopSong(); + //_mixer->stopHandle(_musicHandle); _musicId = 0; } else warning("player_v4a: stop Sound %d", nr); @@ -133,7 +134,7 @@ void Player_V4A::startSound(int nr) { _musicId = nr; if (!_mixer->isSoundHandleActive(_musicHandle)) - _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _tfmxPlay, -1, Audio::Mixer::kMaxChannelVolume, 0, false, false); + _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _tfmxPlay, -1, Audio::Mixer::kMaxChannelVolume, 0, true, false); } } |