[Scummvm-git-logs] scummvm master -> a03183760a428144987832956355054736173878

[dreammaster]

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:
a03183760a TITANIC: Fix music fadeout when entering Parrot room


Commit: a03183760a428144987832956355054736173878
    https://github.com/scummvm/scummvm/commit/a03183760a428144987832956355054736173878
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-12T16:52:12-04:00

Commit Message:
TITANIC: Fix music fadeout when entering Parrot room

Changed paths:
    engines/titanic/sound/restricted_auto_music_player.cpp


diff --git a/engines/titanic/sound/restricted_auto_music_player.cpp b/engines/titanic/sound/restricted_auto_music_player.cpp
index c7e83b3..6b01052 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 {