[Scummvm-cvs-logs] scummvm master -> 09138c9e9ffb70e4831e9ca377632cdd13d4ec5e

[bgK]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
09138c9e9f MOHAWK: Fix setting the ambient sound volumes


Commit: 09138c9e9ffb70e4831e9ca377632cdd13d4ec5e
    https://github.com/scummvm/scummvm/commit/09138c9e9ffb70e4831e9ca377632cdd13d4ec5e
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-08-16T13:18:00+02:00

Commit Message:
MOHAWK: Fix setting the ambient sound volumes

A crash would occur when the number of ambient sound decreases while
keeping the same base sound.
Fixes #7184.

Changed paths:
    engines/mohawk/riven_sound.cpp



diff --git a/engines/mohawk/riven_sound.cpp b/engines/mohawk/riven_sound.cpp
index dd45f94..10a23a0 100644
--- a/engines/mohawk/riven_sound.cpp
+++ b/engines/mohawk/riven_sound.cpp
@@ -200,7 +200,7 @@ void RivenSoundManager::addAmbientSounds(const SLSTRecord &record) {
 }
 
 void RivenSoundManager::setTargetVolumes(const SLSTRecord &record) {
-	for (uint i = 0; i < _ambientSounds.sounds.size(); i++) {
+	for (uint i = 0; i < record.volumes.size(); i++) {
 		_ambientSounds.sounds[i].targetVolume = record.volumes[i] * record.globalVolume / 256;
 		_ambientSounds.sounds[i].targetBalance = record.balances[i];
 	}