diff options
author | Paul Gilbert | 2017-10-13 17:51:49 -0400 |
---|---|---|
committer | Paul Gilbert | 2017-10-13 17:51:49 -0400 |
commit | 1d8ccbe1eae59811c90d5a6a22870e97272e178d (patch) | |
tree | bb9ac838121db6ffd6947df3e5779ca70f3abcea /engines/titanic/sound/auto_music_player.cpp | |
parent | 44aaaf43b8bd3ca32ffde185f4d9f6dd18ab2d5c (diff) | |
download | scummvm-rg350-1d8ccbe1eae59811c90d5a6a22870e97272e178d.tar.gz scummvm-rg350-1d8ccbe1eae59811c90d5a6a22870e97272e178d.tar.bz2 scummvm-rg350-1d8ccbe1eae59811c90d5a6a22870e97272e178d.zip |
TITANIC: Cleanup of auto music player classes and messages
Diffstat (limited to 'engines/titanic/sound/auto_music_player.cpp')
-rw-r--r-- | engines/titanic/sound/auto_music_player.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/sound/auto_music_player.cpp b/engines/titanic/sound/auto_music_player.cpp index ce20c33765..d77424c97f 100644 --- a/engines/titanic/sound/auto_music_player.cpp +++ b/engines/titanic/sound/auto_music_player.cpp @@ -47,7 +47,7 @@ void CAutoMusicPlayer::load(SimpleFile *file) { } bool CAutoMusicPlayer::EnterRoomMsg(CEnterRoomMsg *msg) { - if (!_isRepeated) { + if (!_isEnabled) { CRoomItem *room = findRoom(); if (msg->_newRoom == room) addTimer(2000); @@ -57,11 +57,11 @@ bool CAutoMusicPlayer::EnterRoomMsg(CEnterRoomMsg *msg) { } bool CAutoMusicPlayer::LeaveRoomMsg(CLeaveRoomMsg *msg) { - if (_isRepeated) { + if (_isEnabled) { CRoomItem *room = findRoom(); if (msg->_oldRoom == room) { CChangeMusicMsg changeMsg; - changeMsg._flags = 1; + changeMsg._action = MUSIC_STOP; changeMsg.execute(this); } } |