diff options
| -rw-r--r-- | scumm/imuse.cpp | 2 | ||||
| -rw-r--r-- | sound/mixer.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 826c4127b2..7a6742fbd4 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -1271,7 +1271,7 @@ int IMuseInternal::set_master_volume_intern(uint vol) if (vol > 127) return -1; - if (_music_volume > 0) + if (_music_volume >= 0) vol = vol * _music_volume / 128; _master_volume = vol; diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 201b848f8f..38f25ed6e4 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -757,7 +757,6 @@ void SoundMixer::Channel_MP3::mix(int16 *data, uint len) { mad_fixed_t const *ch; const int16 *vol_tab = _mixer->_volume_table; -// unsigned char volume = ((int)vol_tab[1]) * 32 / 255; unsigned char volume = ((int)vol_tab[1]) / 8; if (_to_be_destroyed) { @@ -770,7 +769,7 @@ void SoundMixer::Channel_MP3::mix(int16 *data, uint len) /* Skip _silence_cut a the start */ if ((_pos_in_frame < _synth.pcm.length) && (_silence_cut > 0)) { - int diff = _synth.pcm.length - _pos_in_frame; + uint32 diff = _synth.pcm.length - _pos_in_frame; if (diff > _silence_cut) diff = _silence_cut; @@ -852,7 +851,6 @@ void SoundMixer::Channel_MP3_CDMUSIC::mix(int16 *data, uint len) { mad_fixed_t const *ch; mad_timer_t frame_duration; -// unsigned char volume = _mixer->_music_volume * 32 / 255; unsigned char volume = _mixer->_music_volume / 8; if (_to_be_destroyed) { |