aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/music_player.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-30 22:18:37 -0500
committerPaul Gilbert2017-01-30 22:18:37 -0500
commit02ebaf06b95235d3a2c8b83ec625e9c2d29178cc (patch)
tree3911b07dd4e49469b761b007f5e0ff78f95540b2 /engines/titanic/sound/music_player.cpp
parent05e36920b36bae2da8c0f0d1413c0470344fcb84 (diff)
downloadscummvm-rg350-02ebaf06b95235d3a2c8b83ec625e9c2d29178cc.tar.gz
scummvm-rg350-02ebaf06b95235d3a2c8b83ec625e9c2d29178cc.tar.bz2
scummvm-rg350-02ebaf06b95235d3a2c8b83ec625e9c2d29178cc.zip
TITANIC: Implementing music room handler update & trigger
Diffstat (limited to 'engines/titanic/sound/music_player.cpp')
-rw-r--r--engines/titanic/sound/music_player.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/sound/music_player.cpp b/engines/titanic/sound/music_player.cpp
index 1f8a847cd2..6fb073b189 100644
--- a/engines/titanic/sound/music_player.cpp
+++ b/engines/titanic/sound/music_player.cpp
@@ -39,7 +39,7 @@ void CMusicPlayer::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_isActive, indent);
file->writeQuotedLine(_stopTarget, indent);
- file->writeNumberLine(_stopWaves, indent);
+ file->writeNumberLine(_musicActive, indent);
file->writeNumberLine(_volume, indent);
CGameObject::save(file, indent);
@@ -49,7 +49,7 @@ void CMusicPlayer::load(SimpleFile *file) {
file->readNumber();
_isActive = file->readNumber();
_stopTarget = file->readString();
- _stopWaves = file->readNumber();
+ _musicActive = file->readNumber();
_volume = file->readNumber();
CGameObject::load(file);
@@ -122,7 +122,7 @@ bool CMusicPlayer::LeaveRoomMsg(CLeaveRoomMsg *msg) {
bool CMusicPlayer::CreateMusicPlayerMsg(CCreateMusicPlayerMsg *msg) {
if (CMusicRoom::_musicHandler) {
- CMusicRoom::_musicHandler->setStopWaves(_stopWaves);
+ CMusicRoom::_musicHandler->setActive(_musicActive);
return true;
}
@@ -158,7 +158,7 @@ bool CMusicPlayer::CreateMusicPlayerMsg(CCreateMusicPlayerMsg *msg) {
wave->load(5, "z#505.wav", 53);
wave->load(6, "z#501.wav", 58);
- CMusicRoom::_musicHandler->setStopWaves(_stopWaves);
+ CMusicRoom::_musicHandler->setActive(_musicActive);
}
return true;