aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins
diff options
context:
space:
mode:
Diffstat (limited to 'engines/hopkins')
-rw-r--r--engines/hopkins/sound.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 3ef1618d8b..d24c3e10b2 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -630,19 +630,17 @@ void SoundManager::PLAY_SOUND2(const Common::String &file) {
void SoundManager::MODSetSampleVolume() {
for (int idx = 0; idx < SWAV_COUNT; ++idx) {
- if (Swav[idx]._active) {
- int volume = (idx == 20) ? (_voiceVolume * 255 / 16) : (_soundVolume * 255 / 16);
+ if (idx != 20 && Swav[idx]._active) {
+ int volume = _soundVolume * 255 / 16;
_vm->_mixer->setChannelVolume(Swav[idx]._soundHandle, volume);
}
}
}
void SoundManager::MODSetVoiceVolume() {
- for (int idx = 0; idx < SWAV_COUNT; ++idx) {
- if (Swav[idx]._active) {
- int volume = (idx == 20) ? (_voiceVolume * 255 / 16) : (_soundVolume * 255 / 16);
- _vm->_mixer->setChannelVolume(Swav[idx]._soundHandle, volume);
- }
+ if (Swav[20]._active) {
+ int volume = _voiceVolume * 255 / 16;
+ _vm->_mixer->setChannelVolume(Swav[20]._soundHandle, volume);
}
}