diff options
author | Travis Howell | 2005-01-22 02:01:22 +0000 |
---|---|---|
committer | Travis Howell | 2005-01-22 02:01:22 +0000 |
commit | 1d86d0599d171e34220424c8febee0532aefcc65 (patch) | |
tree | 1216efa7ef92c809ba3676a127d8baefe38759c0 | |
parent | 3b637456aad81702d8a61b7488e3d43c5d9532ea (diff) | |
download | scummvm-rg350-1d86d0599d171e34220424c8febee0532aefcc65.tar.gz scummvm-rg350-1d86d0599d171e34220424c8febee0532aefcc65.tar.bz2 scummvm-rg350-1d86d0599d171e34220424c8febee0532aefcc65.zip |
Set SFX volume correctly
svn-id: r16612
-rw-r--r-- | simon/simon.cpp | 4 | ||||
-rw-r--r-- | simon/simon.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index cebe5b2f8f..cd6fcfde38 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -665,7 +665,7 @@ int SimonEngine::init(GameDetector &detector) { if (!_mixer->isReady()) warning("Sound initialization failed. " "Features of the game that depend on sound synchronization will most likely break"); - _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume")); + set_volume(ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume")); _system->beginGFXTransaction(); @@ -4225,7 +4225,7 @@ byte *SimonEngine::dx_lock_attached() { void SimonEngine::dx_unlock_attached() { } -void SimonEngine::set_volume(byte volume) { +void SimonEngine::set_volume(int volume) { _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, volume); } diff --git a/simon/simon.h b/simon/simon.h index c636dc0e1e..2d5a4cf0e4 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -808,7 +808,7 @@ protected: void set_dummy_cursor(); - void set_volume(byte volume); + void set_volume(int volume); void save_or_load_dialog(bool load); void o_unk_132_helper_3(); |