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 | |
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')
-rw-r--r-- | engines/titanic/sound/auto_music_player.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/sound/auto_music_player_base.cpp | 20 | ||||
-rw-r--r-- | engines/titanic/sound/auto_music_player_base.h | 2 | ||||
-rw-r--r-- | engines/titanic/sound/node_auto_sound_player.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/sound/restricted_auto_music_player.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/sound/seasonal_music_player.cpp | 10 | ||||
-rw-r--r-- | engines/titanic/sound/trigger_auto_music_player.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/sound/view_auto_sound_player.cpp | 4 |
8 files changed, 27 insertions, 27 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); } } diff --git a/engines/titanic/sound/auto_music_player_base.cpp b/engines/titanic/sound/auto_music_player_base.cpp index 96874768de..968344a5b5 100644 --- a/engines/titanic/sound/auto_music_player_base.cpp +++ b/engines/titanic/sound/auto_music_player_base.cpp @@ -32,13 +32,13 @@ BEGIN_MESSAGE_MAP(CAutoMusicPlayerBase, CGameObject) END_MESSAGE_MAP() CAutoMusicPlayerBase::CAutoMusicPlayerBase() : CGameObject(), - _initialMute(true), _isRepeated(false), _volumeMode(VOL_NORMAL), _transition(1) { + _initialMute(true), _isEnabled(false), _volumeMode(VOL_NORMAL), _transition(1) { } void CAutoMusicPlayerBase::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeQuotedLine(_filename, indent); file->writeNumberLine(_initialMute, indent); - file->writeNumberLine(_isRepeated, indent); + file->writeNumberLine(_isEnabled, indent); file->writeNumberLine(_volumeMode, indent); file->writeNumberLine(_transition, indent); @@ -49,7 +49,7 @@ void CAutoMusicPlayerBase::load(SimpleFile *file) { file->readNumber(); _filename = file->readString(); _initialMute = file->readNumber(); - _isRepeated = file->readNumber(); + _isEnabled = file->readNumber(); _volumeMode = (VolumeMode)file->readNumber(); _transition = file->readNumber(); @@ -62,14 +62,14 @@ bool CAutoMusicPlayerBase::StatusChangeMsg(CStatusChangeMsg *msg) { bool CAutoMusicPlayerBase::TimerMsg(CTimerMsg *msg) { CChangeMusicMsg musicMsg; - musicMsg._flags = 2; + musicMsg._action = MUSIC_START; musicMsg.execute(this); return true; } bool CAutoMusicPlayerBase::LoadSuccessMsg(CLoadSuccessMsg *msg) { - if (_isRepeated) + if (_isEnabled) playGlobalSound(_filename, _volumeMode, _initialMute, true, 0, Audio::Mixer::kMusicSoundType); @@ -77,23 +77,23 @@ bool CAutoMusicPlayerBase::LoadSuccessMsg(CLoadSuccessMsg *msg) { } bool CAutoMusicPlayerBase::ChangeMusicMsg(CChangeMusicMsg *msg) { - if (_isRepeated && msg->_flags == 1) { - _isRepeated = false; + if (_isEnabled && msg->_action == MUSIC_STOP) { + _isEnabled = false; stopGlobalSound(_transition, -1); } if (!msg->_filename.empty()) { _filename = msg->_filename; - if (_isRepeated) { + if (_isEnabled) { stopGlobalSound(_transition, -1); playGlobalSound(_filename, _volumeMode, _initialMute, true, 0, Audio::Mixer::kMusicSoundType); } } - if (!_isRepeated && msg->_flags == 2) { - _isRepeated = true; + if (!_isEnabled && msg->_action == MUSIC_START) { + _isEnabled = true; playGlobalSound(_filename, _volumeMode, _initialMute, true, 0, Audio::Mixer::kMusicSoundType); } diff --git a/engines/titanic/sound/auto_music_player_base.h b/engines/titanic/sound/auto_music_player_base.h index 4dd0665488..d0392951bc 100644 --- a/engines/titanic/sound/auto_music_player_base.h +++ b/engines/titanic/sound/auto_music_player_base.h @@ -36,7 +36,7 @@ class CAutoMusicPlayerBase : public CGameObject { protected: CString _filename; bool _initialMute; - bool _isRepeated; + bool _isEnabled; VolumeMode _volumeMode; int _transition; public: diff --git a/engines/titanic/sound/node_auto_sound_player.cpp b/engines/titanic/sound/node_auto_sound_player.cpp index 40b3d2ea39..60a93d6b69 100644 --- a/engines/titanic/sound/node_auto_sound_player.cpp +++ b/engines/titanic/sound/node_auto_sound_player.cpp @@ -53,7 +53,7 @@ bool CNodeAutoSoundPlayer::EnterNodeMsg(CEnterNodeMsg *msg) { if (_enabled) { CChangeMusicMsg changeMsg; - changeMsg._flags = 1; + changeMsg._action = MUSIC_STOP; changeMsg.execute(room, CAutoMusicPlayer::_type, MSGFLAG_CLASS_DEF | MSGFLAG_BREAK_IF_HANDLED | MSGFLAG_SCAN); } @@ -72,7 +72,7 @@ bool CNodeAutoSoundPlayer::LeaveNodeMsg(CLeaveNodeMsg *msg) { if (_enabled) { CChangeMusicMsg changeMsg; - changeMsg._flags = 2; + changeMsg._action = MUSIC_START; changeMsg.execute(room, CAutoMusicPlayer::_type, MSGFLAG_CLASS_DEF | MSGFLAG_BREAK_IF_HANDLED | MSGFLAG_SCAN); } diff --git a/engines/titanic/sound/restricted_auto_music_player.cpp b/engines/titanic/sound/restricted_auto_music_player.cpp index 6b01052ebd..a75a55bb15 100644 --- a/engines/titanic/sound/restricted_auto_music_player.cpp +++ b/engines/titanic/sound/restricted_auto_music_player.cpp @@ -58,7 +58,7 @@ bool CRestrictedAutoMusicPlayer::EnterRoomMsg(CEnterRoomMsg *msg) { CString roomName = msg->_oldRoom->getName(); if (!_oldRoomName.compareToIgnoreCase(roomName)) { - _isRepeated = true; + _isEnabled = true; return false; } else { return CAutoMusicPlayer::EnterRoomMsg(msg); @@ -69,7 +69,7 @@ bool CRestrictedAutoMusicPlayer::LeaveRoomMsg(CLeaveRoomMsg *msg) { CString roomName = msg->_newRoom->getName(); if (petCheckNode(_newNodeName) || !_newRoomName.compareToIgnoreCase(roomName)) { - _isRepeated = false; + _isEnabled = false; return true; } else { return CAutoMusicPlayer::LeaveRoomMsg(msg); diff --git a/engines/titanic/sound/seasonal_music_player.cpp b/engines/titanic/sound/seasonal_music_player.cpp index 637a0020ba..ff5e4809f8 100644 --- a/engines/titanic/sound/seasonal_music_player.cpp +++ b/engines/titanic/sound/seasonal_music_player.cpp @@ -90,15 +90,15 @@ bool CSeasonalMusicPlayer::ChangeSeasonMsg(CChangeSeasonMsg *msg) { bool CSeasonalMusicPlayer::ArboretumGateMsg(CArboretumGateMsg *msg) { CChangeMusicMsg changeMsg; - changeMsg._flags = msg->_value ? 2 : 1; + changeMsg._action = msg->_value ? MUSIC_START : MUSIC_STOP; changeMsg.execute(this); return true; } bool CSeasonalMusicPlayer::ChangeMusicMsg(CChangeMusicMsg *msg) { - if (_isRepeated && msg->_flags == 1) { - _isRepeated = false; + if (_isEnabled && msg->_action == MUSIC_STOP) { + _isEnabled = false; stopGlobalSound(_transition, -1); } @@ -118,8 +118,8 @@ bool CSeasonalMusicPlayer::ChangeMusicMsg(CChangeMusicMsg *msg) { } } - if (!_isRepeated && msg->_flags == 2) { - _isRepeated = true; + if (!_isEnabled && msg->_action == MUSIC_START) { + _isEnabled = true; loadSound(TRANSLATE("c#64.wav", "c#47.wav")); loadSound(TRANSLATE("c#63.wav", "c#46.wav")); loadSound(TRANSLATE("c#65.wav", "c#48.wav")); diff --git a/engines/titanic/sound/trigger_auto_music_player.cpp b/engines/titanic/sound/trigger_auto_music_player.cpp index a332570aba..15f1c9f850 100644 --- a/engines/titanic/sound/trigger_auto_music_player.cpp +++ b/engines/titanic/sound/trigger_auto_music_player.cpp @@ -47,11 +47,11 @@ bool CTriggerAutoMusicPlayer::TriggerAutoMusicPlayerMsg(CTriggerAutoMusicPlayerM CRoomItem *room2 = msg->_value == 2 ? locateRoom(_roomName) : findRoom(); CChangeMusicMsg changeMsg; - changeMsg._flags = 1; + changeMsg._action = MUSIC_STOP; changeMsg.execute(room1, CAutoMusicPlayer::_type, MSGFLAG_CLASS_DEF | MSGFLAG_BREAK_IF_HANDLED | MSGFLAG_SCAN); - changeMsg._flags = 2; + changeMsg._action = MUSIC_START; changeMsg.execute(room2, CAutoMusicPlayer::_type, MSGFLAG_CLASS_DEF | MSGFLAG_BREAK_IF_HANDLED | MSGFLAG_SCAN); diff --git a/engines/titanic/sound/view_auto_sound_player.cpp b/engines/titanic/sound/view_auto_sound_player.cpp index 55501fe340..3937a82ad7 100644 --- a/engines/titanic/sound/view_auto_sound_player.cpp +++ b/engines/titanic/sound/view_auto_sound_player.cpp @@ -53,7 +53,7 @@ bool CViewAutoSoundPlayer::EnterViewMsg(CEnterViewMsg *msg) { if (_enabled) { CChangeMusicMsg changeMsg; - changeMsg._flags = 1; + changeMsg._action = MUSIC_STOP; changeMsg.execute(room, CAutoMusicPlayer::_type, MSGFLAG_CLASS_DEF |MSGFLAG_BREAK_IF_HANDLED | MSGFLAG_SCAN); } @@ -72,7 +72,7 @@ bool CViewAutoSoundPlayer::LeaveViewMsg(CLeaveViewMsg *msg) { if (_enabled) { CChangeMusicMsg changeMsg; - changeMsg._flags = 2; + changeMsg._action = MUSIC_START; changeMsg.execute(room, CAutoMusicPlayer::_type, MSGFLAG_CLASS_DEF | MSGFLAG_BREAK_IF_HANDLED | MSGFLAG_SCAN); } |