[Scummvm-cvs-logs] scummvm master -> 57b106d41793f91f571c7bd29b71165f875c1372

m-kiewitz m_kiewitz at users.sourceforge.net
Fri May 22 17:53:31 CEST 2015


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:
57b106d417 SHERLOCK: sound: fix CLIP


Commit: 57b106d41793f91f571c7bd29b71165f875c1372
    https://github.com/scummvm/scummvm/commit/57b106d41793f91f571c7bd29b71165f875c1372
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-05-22T17:52:51+02:00

Commit Message:
SHERLOCK: sound: fix CLIP

Changed paths:
    engines/sherlock/sound.cpp



diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 2ed6a1b..4f27481 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -92,7 +92,7 @@ byte Sound::decodeSample(byte sample, byte &reference, int16 &scale) {
 	int16 ref = 0;
 
 	// clip bad ADPCM-4 sample
-	CLIP<int16>(samp, 0, 63);
+	samp = CLIP<int16>(samp, 0, 63);
 
 	ref = reference + creativeADPCM_ScaleMap[samp];
 	if (ref > 0xff) {






More information about the Scummvm-git-logs mailing list