diff options
author | Strangerke | 2015-11-30 01:03:14 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-12-23 21:33:44 +0100 |
commit | 05f54b7fe0a0fbdfc731404b77b149f10ad5679b (patch) | |
tree | 210044ed8679bb7c2b575941c5f908b07c2af3ea /engines/lab/readdiff.cpp | |
parent | 771e558d905ee467280482d62697dc66d969ed2b (diff) | |
download | scummvm-rg350-05f54b7fe0a0fbdfc731404b77b149f10ad5679b.tar.gz scummvm-rg350-05f54b7fe0a0fbdfc731404b77b149f10ad5679b.tar.bz2 scummvm-rg350-05f54b7fe0a0fbdfc731404b77b149f10ad5679b.zip |
LAB: Make _music a member of LabEngine instead of a global
Diffstat (limited to 'engines/lab/readdiff.cpp')
-rw-r--r-- | engines/lab/readdiff.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp index ca7d3905ce..88b4c1805d 100644 --- a/engines/lab/readdiff.cpp +++ b/engines/lab/readdiff.cpp @@ -393,7 +393,7 @@ void stopDiff() { void stopDiffEnd() { if (IsPlaying) { while (IsPlaying) { - g_music->updateMusic(); + g_lab->g_music->updateMusic(); g_lab->diffNextFrame(); } } @@ -431,14 +431,14 @@ void readSound(bool waitTillFinished, Common::File *file) { return; while (soundTag != 65535) { - g_music->updateMusic(); + g_lab->g_music->updateMusic(); soundTag = file->readUint32LE(); soundSize = file->readUint32LE() - 8; if ((soundTag == 30) || (soundTag == 31)) { if (waitTillFinished) { - while (g_music->isSoundEffectActive()) { - g_music->updateMusic(); + while (g_lab->g_music->isSoundEffectActive()) { + g_lab->g_music->updateMusic(); g_lab->waitTOF(); } } @@ -449,11 +449,11 @@ void readSound(bool waitTillFinished, Common::File *file) { file->skip(2); byte *soundData = (byte *)malloc(soundSize); file->read(soundData, soundSize); - g_music->playSoundEffect(sampleRate, soundSize, soundData); + g_lab->g_music->playSoundEffect(sampleRate, soundSize, soundData); } else if (soundTag == 65535L) { if (waitTillFinished) { - while (g_music->isSoundEffectActive()) { - g_music->updateMusic(); + while (g_lab->g_music->isSoundEffectActive()) { + g_lab->g_music->updateMusic(); g_lab->waitTOF(); } } |