aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel/music.cpp
diff options
context:
space:
mode:
authorMax Horn2009-11-02 21:56:29 +0000
committerMax Horn2009-11-02 21:56:29 +0000
commit5cf868b75711c69736d3b2eb6f1068bdc48349ae (patch)
tree1cc0ba610669f66f6b038dd5b668a496a50f09cc /engines/tinsel/music.cpp
parent51933629d1f1a17839ddbb75b2b619effe117abb (diff)
downloadscummvm-rg350-5cf868b75711c69736d3b2eb6f1068bdc48349ae.tar.gz
scummvm-rg350-5cf868b75711c69736d3b2eb6f1068bdc48349ae.tar.bz2
scummvm-rg350-5cf868b75711c69736d3b2eb6f1068bdc48349ae.zip
TINSEL: Turn config code into a simple C++ class
svn-id: r45617
Diffstat (limited to 'engines/tinsel/music.cpp')
-rw-r--r--engines/tinsel/music.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 7bce8a3bd6..4f218c937e 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -184,8 +184,8 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) {
// TODO: Maybe this should be moved to a better place...
if (TinselV1PSX) return false;
- if (volMusic != 0) {
- SetMidiVolume(volMusic);
+ if (_vm->_config->_musicVolume != 0) {
+ SetMidiVolume(_vm->_config->_musicVolume);
}
// the index and length of the last tune loaded
@@ -317,7 +317,7 @@ bool StopMidi() {
* Gets the volume of the MIDI music.
*/
int GetMidiVolume() {
- return volMusic;
+ return _vm->_config->_musicVolume;
}
static int priorVolMusic = 0;
@@ -963,9 +963,9 @@ void RestoreMidiFacts(SCNHANDLE Midi, bool Loop) {
currentMidi = Midi;
currentLoop = Loop;
- if (volMusic != 0 && Loop) {
+ if (_vm->_config->_musicVolume != 0 && Loop) {
PlayMidiSequence(currentMidi, true);
- SetMidiVolume(volMusic);
+ SetMidiVolume(_vm->_config->_musicVolume);
}
}