diff options
| author | Max Horn | 2004-12-27 23:46:55 +0000 |
|---|---|---|
| committer | Max Horn | 2004-12-27 23:46:55 +0000 |
| commit | 53ff19eccb567835d00d460e9d21c2b2ed1eddd0 (patch) | |
| tree | 16b1dcd0795158df7efbd226bdec4ceb76f29a64 | |
| parent | f9b1e4118c5b3350528087f982c2fa9d34a365de (diff) | |
| download | scummvm-rg350-53ff19eccb567835d00d460e9d21c2b2ed1eddd0.tar.gz scummvm-rg350-53ff19eccb567835d00d460e9d21c2b2ed1eddd0.tar.bz2 scummvm-rg350-53ff19eccb567835d00d460e9d21c2b2ed1eddd0.zip | |
Use SoundMixer::kMaxMixerVolume
svn-id: r16350
| -rw-r--r-- | queen/queen.cpp | 2 | ||||
| -rw-r--r-- | sword1/sword1.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp index ddb7523206..be15850202 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -360,7 +360,7 @@ int QueenEngine::init(GameDetector &detector) { warning("Sound initialisation failed."); _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume")); // Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages - _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, 256); + _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, SoundMixer::kMaxMixerVolume); int midiDriver = MidiDriver::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE); MidiDriver *driver = MidiDriver::createMidi(midiDriver); diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp index 4bafa81544..d48f25edee 100644 --- a/sword1/sword1.cpp +++ b/sword1/sword1.cpp @@ -165,8 +165,8 @@ int SwordEngine::init(GameDetector &detector) { _resMan = new ResMan("swordres.rif"); debug(5, "Starting object manager"); _objectMan = new ObjectMan(_resMan); - _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, 256); - _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, 256); + _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, SoundMixer::kMaxMixerVolume); + _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, SoundMixer::kMaxMixerVolume); _mouse = new Mouse(_system, _resMan, _objectMan); _screen = new Screen(_system, _resMan, _objectMan); _music = new Music(_system, _mixer); |