[Scummvm-cvs-logs] scummvm master -> 31201f93d8b7df2374969a21d174949cf9539489

anotherguest larspson at gmail.com
Tue Oct 11 09:41:11 CEST 2011


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:
31201f93d8 Last Express: CLIP should use a <int> template to compile correctly.


Commit: 31201f93d8b7df2374969a21d174949cf9539489
    https://github.com/scummvm/scummvm/commit/31201f93d8b7df2374969a21d174949cf9539489
Author: anotherguest (larspson at gmail.com)
Date: 2011-10-11T00:33:37-07:00

Commit Message:
Last Express: CLIP should use a <int> template to compile correctly.

Changed paths:
    engines/lastexpress/data/snd.cpp



diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp
index 6845be8..a9bee61 100644
--- a/engines/lastexpress/data/snd.cpp
+++ b/engines/lastexpress/data/snd.cpp
@@ -396,7 +396,7 @@ public:
 				// First nibble
 				idx = data >> 4;
 				step = stepTable[idx + _status.ima_ch[0].stepIndex / 4];
-				sample = CLIP(imaTable[idx + _status.ima_ch[0].stepIndex / 4] + _status.ima_ch[0].last, -32767, 32767);
+				sample = CLIP<int>(imaTable[idx + _status.ima_ch[0].stepIndex / 4] + _status.ima_ch[0].last, -32767, 32767);
 				buffer[samples] = (_stepAdjust2 * sample) >> _stepAdjust1;
 
 				// Second nibble






More information about the Scummvm-git-logs mailing list