aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/music_player.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-29 20:36:15 -0500
committerPaul Gilbert2017-01-29 20:36:15 -0500
commit1948b62a80f056050f94c8a56f00de58f42394b2 (patch)
treedf0c434c0cb48cccc2f402d70c7bc7aa1e62bde2 /engines/titanic/sound/music_player.cpp
parentfd69ac2943fe8efcc9a894bbb7a48c4d3e9427c6 (diff)
downloadscummvm-rg350-1948b62a80f056050f94c8a56f00de58f42394b2.tar.gz
scummvm-rg350-1948b62a80f056050f94c8a56f00de58f42394b2.tar.bz2
scummvm-rg350-1948b62a80f056050f94c8a56f00de58f42394b2.zip
TITANIC: Cleanup of music room object classes
Diffstat (limited to 'engines/titanic/sound/music_player.cpp')
-rw-r--r--engines/titanic/sound/music_player.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/titanic/sound/music_player.cpp b/engines/titanic/sound/music_player.cpp
index 548941871d..a6a791f96e 100644
--- a/engines/titanic/sound/music_player.cpp
+++ b/engines/titanic/sound/music_player.cpp
@@ -110,6 +110,7 @@ bool CMusicPlayer::FrameMsg(CFrameMsg *msg) {
}
bool CMusicPlayer::EnterRoomMsg(CEnterRoomMsg *msg) {
+ // Set up a timer that will create a music handler
addTimer(100);
return true;
}
@@ -171,6 +172,7 @@ bool CMusicPlayer::TimerMsg(CTimerMsg *msg) {
bool CMusicPlayer::LoadSuccessMsg(CLoadSuccessMsg *msg) {
if (_isActive) {
+ // Music is meant to be playing, so restart it
CStopMusicMsg stopMsg;
stopMsg.execute(this);
CStartMusicMsg startMsg;