[Scummvm-git-logs] scummvm master -> f4f15667a5a7cdde12f5aa7ccf1b7384277bffc4
dreammaster
dreammaster at scummvm.org
Wed Aug 2 01:56:22 CEST 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f4f15667a5 TITANIC: Fix playback of ambient music for Top of the Well
Commit: f4f15667a5a7cdde12f5aa7ccf1b7384277bffc4
https://github.com/scummvm/scummvm/commit/f4f15667a5a7cdde12f5aa7ccf1b7384277bffc4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-01T19:56:16-04:00
Commit Message:
TITANIC: Fix playback of ambient music for Top of the Well
Changed paths:
engines/titanic/sound/auto_music_player_base.cpp
engines/titanic/sound/restricted_auto_music_player.cpp
diff --git a/engines/titanic/sound/auto_music_player_base.cpp b/engines/titanic/sound/auto_music_player_base.cpp
index 31522d8..9687476 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 2384d4d..c7e83b3 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);
}
}
More information about the Scummvm-git-logs
mailing list