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/game | |
| 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/game')
| -rw-r--r-- | engines/titanic/game/bridge_view.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/computer_screen.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/emma_control.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/game/bridge_view.cpp b/engines/titanic/game/bridge_view.cpp index 608724c16c..d98cee13c0 100644 --- a/engines/titanic/game/bridge_view.cpp +++ b/engines/titanic/game/bridge_view.cpp @@ -77,7 +77,7 @@ bool CBridgeView::ActMsg(CActMsg *msg) { hideMouse(); CChangeMusicMsg musicMsg; - musicMsg._flags = 1; + musicMsg._action = MUSIC_STOP; musicMsg.execute("BridgeAutoMusicPlayer"); playSound(TRANSLATE("a#42.wav", "a#35.wav")); playMovie(MOVIE_NOTIFY_OBJECT); diff --git a/engines/titanic/game/computer_screen.cpp b/engines/titanic/game/computer_screen.cpp index dee469af1c..8150448be7 100644 --- a/engines/titanic/game/computer_screen.cpp +++ b/engines/titanic/game/computer_screen.cpp @@ -116,7 +116,7 @@ bool CComputerScreen::TimerMsg(CTimerMsg *msg) { break; case 2: { - CChangeMusicMsg musicMsg(CString(), 1); + CChangeMusicMsg musicMsg(CString(), MUSIC_STOP); musicMsg.execute("HomeMusicPlayer"); playSound(TRANSLATE("a#33.wav", "a#28.wav")); playSound(TRANSLATE("a#31.wav", "a#26.wav")); diff --git a/engines/titanic/game/emma_control.cpp b/engines/titanic/game/emma_control.cpp index e3ba7cc42c..46cde9bfcd 100644 --- a/engines/titanic/game/emma_control.cpp +++ b/engines/titanic/game/emma_control.cpp @@ -57,7 +57,7 @@ bool CEmmaControl::EnterViewMsg(CEnterViewMsg *msg) { bool CEmmaControl::StatusChangeMsg(CStatusChangeMsg *msg) { _flag = !_flag; setVisible(_flag); - CChangeMusicMsg changeMsg(_flag ? _visibleSoundName : _hiddenSoundName, 0); + CChangeMusicMsg changeMsg(_flag ? _visibleSoundName : _hiddenSoundName, MUSIC_NONE); changeMsg.execute(findRoom(), CAutoMusicPlayer::_type, MSGFLAG_SCAN | MSGFLAG_BREAK_IF_HANDLED | MSGFLAG_CLASS_DEF); return true; |