diff options
| author | Max Horn | 2003-11-11 00:40:35 +0000 |
|---|---|---|
| committer | Max Horn | 2003-11-11 00:40:35 +0000 |
| commit | 0bcc7ce80eb6a8daa35bf2591281974cceff8078 (patch) | |
| tree | 570ec89c06a94d71ceb5219c4c17010c0da64331 /scumm/script_v8.cpp | |
| parent | b38995b288f2c5014ff1a9867d12807182ceb051 (diff) | |
| download | scummvm-rg350-0bcc7ce80eb6a8daa35bf2591281974cceff8078.tar.gz scummvm-rg350-0bcc7ce80eb6a8daa35bf2591281974cceff8078.tar.bz2 scummvm-rg350-0bcc7ce80eb6a8daa35bf2591281974cceff8078.zip | |
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup
svn-id: r11257
Diffstat (limited to 'scumm/script_v8.cpp')
| -rw-r--r-- | scumm/script_v8.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 562b18c86f..b6339f3d09 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -20,6 +20,7 @@ */ #include "stdafx.h" +#include "common/config-manager.h" #include "scumm/actor.h" #include "scumm/akos.h" #include "scumm/charset.h" @@ -1472,13 +1473,13 @@ void ScummEngine_v8::o8_kernelGetFunctions() { } break; case 0xDD: // getMasterSFXVol - push(_sound->_sound_volume_sfx / 2); + push(ConfMan.getInt("sfx_volume") / 2); break; case 0xDE: // getMasterVoiceVol - push(_sound->_sound_volume_sfx / 2); + push(ConfMan.getInt("sfx_volume") / 2); break; case 0xDF: // getMasterMusicVol - push(_sound->_sound_volume_music / 2); + push(ConfMan.getInt("music_volume") / 2); break; case 0xE0: // readRegistryValue { |