From a03183760a428144987832956355054736173878 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 12 Aug 2017 16:52:12 -0400 Subject: TITANIC: Fix music fadeout when entering Parrot room --- engines/titanic/sound/restricted_auto_music_player.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines') diff --git a/engines/titanic/sound/restricted_auto_music_player.cpp b/engines/titanic/sound/restricted_auto_music_player.cpp index c7e83b3958..6b01052ebd 100644 --- a/engines/titanic/sound/restricted_auto_music_player.cpp +++ b/engines/titanic/sound/restricted_auto_music_player.cpp @@ -57,18 +57,18 @@ bool CRestrictedAutoMusicPlayer::EnterRoomMsg(CEnterRoomMsg *msg) { return false; CString roomName = msg->_oldRoom->getName(); - if (_oldRoomName.compareToIgnoreCase(roomName)) { - return CAutoMusicPlayer::EnterRoomMsg(msg); - } else { + if (!_oldRoomName.compareToIgnoreCase(roomName)) { _isRepeated = true; return false; + } else { + return CAutoMusicPlayer::EnterRoomMsg(msg); } } bool CRestrictedAutoMusicPlayer::LeaveRoomMsg(CLeaveRoomMsg *msg) { CString roomName = msg->_newRoom->getName(); - if (petCheckNode(_newNodeName) || _newRoomName.compareToIgnoreCase(roomName)) { + if (petCheckNode(_newNodeName) || !_newRoomName.compareToIgnoreCase(roomName)) { _isRepeated = false; return true; } else { -- cgit v1.2.3