diff options
| author | Paweł Kołodziejski | 2002-08-14 20:43:56 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-08-14 20:43:56 +0000 |
| commit | 105f966c6a66803653db90a01303cee3a08e5c0d (patch) | |
| tree | ff6ca43e24badde1ca31cdc3748d14e072716612 /gui | |
| parent | f2faf9063bda1acc1b9efd8bd1e5bc8b4af4a98c (diff) | |
| download | scummvm-rg350-105f966c6a66803653db90a01303cee3a08e5c0d.tar.gz scummvm-rg350-105f966c6a66803653db90a01303cee3a08e5c0d.tar.bz2 scummvm-rg350-105f966c6a66803653db90a01303cee3a08e5c0d.zip | |
moved to Sound class
svn-id: r4744
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/dialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/dialog.cpp b/gui/dialog.cpp index dea3d58b7b..ecc444b71d 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -447,9 +447,9 @@ void SoundDialog::open() Dialog::open(); // get current variables - _soundVolumeMaster = scumm->_sound_volume_master; - _soundVolumeMusic = scumm->_sound_volume_music; - _soundVolumeSfx = scumm->_sound_volume_sfx; + _soundVolumeMaster = scumm->_sound->_sound_volume_master; + _soundVolumeMusic = scumm->_sound->_sound_volume_music; + _soundVolumeSfx = scumm->_sound->_sound_volume_sfx; masterVolumeSlider->setValue(_soundVolumeMaster); musicVolumeSlider->setValue(_soundVolumeMusic); @@ -483,9 +483,9 @@ void SoundDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) Scumm *scumm = _gui->getScumm(); // FIXME: Look at Fingolfins comments in Gui::handleSoundDialogCommand(), gui.cpp - scumm->_sound_volume_master = _soundVolumeMaster; // Master - scumm->_sound_volume_music = _soundVolumeMusic; // Music - scumm->_sound_volume_sfx = _soundVolumeSfx; // SFX + scumm->_sound->_sound_volume_master = _soundVolumeMaster; // Master + scumm->_sound->_sound_volume_music = _soundVolumeMusic; // Music + scumm->_sound->_sound_volume_sfx = _soundVolumeSfx; // SFX scumm->_imuse->set_music_volume(_soundVolumeMusic); scumm->_imuse->set_master_volume(_soundVolumeMaster); |