TITANIC: Fix music fadeout when entering Parrot room

scummvm · Aug 12, 2017 · a031837 · a031837
1 parent 8fe7187
commit a031837
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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 {