[Scummvm-cvs-logs] scummvm master -> c8b8a2c9ee3420c0f36acde345737cee226ba845

[eriktorbjorn]

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:
c8b8a2c9ee TUCKER: Fix overflow in volume calculation


Commit: c8b8a2c9ee3420c0f36acde345737cee226ba845
    https://github.com/scummvm/scummvm/commit/c8b8a2c9ee3420c0f36acde345737cee226ba845
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-09-27T11:53:23+02:00

Commit Message:
TUCKER: Fix overflow in volume calculation

This affected Bud's line, "Is that the great mystery invention you
had hidden away?" in the intro, making it very hard to hear, and
possibly other sounds as well. I don't know if this was a bug in
the original game, but it's much closer to the English version I
own now.

Changed paths:
    engines/tucker/tucker.h



diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index a423915..3bbf6a5 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -246,6 +246,15 @@ private:
 };
 
 inline int scaleMixerVolume(int volume, int max = 100) {
+	if (volume > max) {
+		// This happens for instance for Bud's line, "Is that the
+		// great mystery invention you had hidden away?" in the intro,
+		// which is played at volume 110 out of 100. This made it very
+		// hard to hear. I'm not sure if this was a bug in the original
+		// game, or if it had the ability to amplify sounds.
+		warning("scaleMixerVolume: Adjusting volume %d to %d", volume, max);
+		volume = max;
+	}
 	return volume * Audio::Mixer::kMaxChannelVolume / max;
 }