TITANIC: Fix playback of ambient music for Top of the Well

scummvm · Aug 1, 2017 · f4f1566 · f4f1566
1 parent 848a601
commit f4f1566
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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);
 	}
 }