diff options
| author | Max Horn | 2004-11-28 21:24:02 +0000 |
|---|---|---|
| committer | Max Horn | 2004-11-28 21:24:02 +0000 |
| commit | 1ae87c0fbbbb38950e2364da212adeb96d464d0c (patch) | |
| tree | ca2ce9c9325468b6d6f1b1c8f799bb81853824a5 /scumm/script_v6he.cpp | |
| parent | 6c84bbf2bd808c7e72cdcc9e5d5f68562916606b (diff) | |
| download | scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.tar.gz scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.tar.bz2 scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.zip | |
Trying to cleanup the volume control mess inside the SCUMM engine: renamed MusicEngine::setMasterVolume to setMusicVolume; fixed iMuse to use the correct method for setMusicVolume (previously modified the iMuse internal volume control); hooked up the volume control of various other music engines; added ScummEngine::setupVolume method which can be called whenever volume settings change, and which gurantees that those are handled uniformly
svn-id: r15944
Diffstat (limited to 'scumm/script_v6he.cpp')
| -rw-r--r-- | scumm/script_v6he.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index 9ac4019aee..a8602475b9 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -1159,7 +1159,7 @@ void ScummEngine_v60he::o60_soundOps() { int arg = pop(); switch (subOp) { case 0xde: - _imuse->set_music_volume(arg); + _imuse->setMusicVolume(arg); break; case 0xdf: // Used in fbear introduction |