aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/music_player.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-10 23:10:46 -0400
committerPaul Gilbert2016-08-10 23:10:46 -0400
commit47c7e39bca80a5249288fac5c5da4a44d552e763 (patch)
tree9d33277863fb8e3414b3c23d1809a2cf7a0b0200 /engines/titanic/sound/music_player.cpp
parent2b486009f51bf386be3c9d97c22b7b17b0e898e8 (diff)
downloadscummvm-rg350-47c7e39bca80a5249288fac5c5da4a44d552e763.tar.gz
scummvm-rg350-47c7e39bca80a5249288fac5c5da4a44d552e763.tar.bz2
scummvm-rg350-47c7e39bca80a5249288fac5c5da4a44d552e763.zip
TITANIC: Add music handler stopping code
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 fb5a596875..cd764c7f93 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(_fieldCC, indent);
+ file->writeNumberLine(_stopWaves, indent);
file->writeNumberLine(_musicId, indent);
CGameObject::save(file, indent);
@@ -49,7 +49,7 @@ void CMusicPlayer::load(SimpleFile *file) {
file->readNumber();
_isActive = file->readNumber();
_stopTarget = file->readString();
- _fieldCC = file->readNumber();
+ _stopWaves = file->readNumber();
_musicId = file->readNumber();
CGameObject::load(file);
@@ -120,7 +120,7 @@ bool CMusicPlayer::LeaveRoomMsg(CLeaveRoomMsg *msg) {
bool CMusicPlayer::CreateMusicPlayerMsg(CCreateMusicPlayerMsg *msg) {
if (CMusicRoom::_musicHandler) {
- CMusicRoom::_musicHandler->set124(_fieldCC);
+ CMusicRoom::_musicHandler->setStopWaves(_stopWaves);
return true;
}
@@ -156,7 +156,7 @@ bool CMusicPlayer::CreateMusicPlayerMsg(CCreateMusicPlayerMsg *msg) {
wave->load(5, "z#505.wav", 53);
wave->load(6, "z#501.wav", 58);
- CMusicRoom::_musicHandler->set124(_fieldCC);
+ CMusicRoom::_musicHandler->setStopWaves(_stopWaves);
}
return true;