diff options
| author | Paul Gilbert | 2017-08-01 19:56:16 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-08-01 19:56:16 -0400 |
| commit | f4f15667a5a7cdde12f5aa7ccf1b7384277bffc4 (patch) | |
| tree | c692407a161465df96821387f426674bf2f2c78a | |
| parent | 848a601c908f2739778c3cd66198891639f614d0 (diff) | |
| download | scummvm-rg350-f4f15667a5a7cdde12f5aa7ccf1b7384277bffc4.tar.gz scummvm-rg350-f4f15667a5a7cdde12f5aa7ccf1b7384277bffc4.tar.bz2 scummvm-rg350-f4f15667a5a7cdde12f5aa7ccf1b7384277bffc4.zip | |
TITANIC: Fix playback of ambient music for Top of the Well
| -rw-r--r-- | engines/titanic/sound/auto_music_player_base.cpp | 9 | ||||
| -rw-r--r-- | engines/titanic/sound/restricted_auto_music_player.cpp | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/engines/titanic/sound/auto_music_player_base.cpp b/engines/titanic/sound/auto_music_player_base.cpp index 31522d85b4..96874768de 100644 --- a/engines/titanic/sound/auto_music_player_base.cpp +++ b/engines/titanic/sound/auto_music_player_base.cpp @@ -70,7 +70,8 @@ bool CAutoMusicPlayerBase::TimerMsg(CTimerMsg *msg) { bool CAutoMusicPlayerBase::LoadSuccessMsg(CLoadSuccessMsg *msg) { if (_isRepeated) - playGlobalSound(_filename, _volumeMode, _initialMute, true, 0); + playGlobalSound(_filename, _volumeMode, _initialMute, true, 0, + Audio::Mixer::kMusicSoundType); return true; } @@ -86,13 +87,15 @@ bool CAutoMusicPlayerBase::ChangeMusicMsg(CChangeMusicMsg *msg) { if (_isRepeated) { stopGlobalSound(_transition, -1); - playGlobalSound(_filename, _volumeMode, _initialMute, true, 0); + playGlobalSound(_filename, _volumeMode, _initialMute, true, 0, + Audio::Mixer::kMusicSoundType); } } if (!_isRepeated && msg->_flags == 2) { _isRepeated = true; - playGlobalSound(_filename, _volumeMode, _initialMute, true, 0); + playGlobalSound(_filename, _volumeMode, _initialMute, true, 0, + Audio::Mixer::kMusicSoundType); } return true; diff --git a/engines/titanic/sound/restricted_auto_music_player.cpp b/engines/titanic/sound/restricted_auto_music_player.cpp index 2384d4da25..c7e83b3958 100644 --- a/engines/titanic/sound/restricted_auto_music_player.cpp +++ b/engines/titanic/sound/restricted_auto_music_player.cpp @@ -58,10 +58,10 @@ bool CRestrictedAutoMusicPlayer::EnterRoomMsg(CEnterRoomMsg *msg) { CString roomName = msg->_oldRoom->getName(); if (_oldRoomName.compareToIgnoreCase(roomName)) { + return CAutoMusicPlayer::EnterRoomMsg(msg); + } else { _isRepeated = true; return false; - } else { - return CAutoMusicPlayer::EnterRoomMsg(msg); } } |