aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound
diff options
context:
space:
mode:
authorPaul Gilbert2017-08-12 16:52:12 -0400
committerPaul Gilbert2017-08-12 16:52:12 -0400
commita03183760a428144987832956355054736173878 (patch)
tree73613cd46eb1bcb675b25d9fd5011bcd5d8bf0ab /engines/titanic/sound
parent8fe71870605ff9f42b4e17ef7c4ea37cef6f0452 (diff)
downloadscummvm-rg350-a03183760a428144987832956355054736173878.tar.gz
scummvm-rg350-a03183760a428144987832956355054736173878.tar.bz2
scummvm-rg350-a03183760a428144987832956355054736173878.zip
TITANIC: Fix music fadeout when entering Parrot room
Diffstat (limited to 'engines/titanic/sound')
-rw-r--r--engines/titanic/sound/restricted_auto_music_player.cpp8
1 files changed, 4 insertions, 4 deletions
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 {