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

[clone2727]

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:
aba818d195 ZVISION: Attempt to fix compilation on AmigaOS4


Commit: aba818d19578836aab41e0bc484dfbdfc5da3231
    https://github.com/scummvm/scummvm/commit/aba818d19578836aab41e0bc484dfbdfc5da3231
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-10-18T03:13:32-07:00

Commit Message:
ZVISION: Attempt to fix compilation on AmigaOS4

Changed paths:
    engines/zvision/zork_raw.cpp



diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp
index 55493da..21613d9 100644
--- a/engines/zvision/zork_raw.cpp
+++ b/engines/zvision/zork_raw.cpp
@@ -127,7 +127,7 @@ int RawZorkStream::readBuffer(int16 *buffer, const int numSamples) {
 			sample = -sample;
 
 		sample += _lastSample[channel].sample;
-		sample = CLIP(sample, -32768, 32767);
+		sample = CLIP<int32>(sample, -32768, 32767);
 
 		buffer[bytesRead - 1] = (int16)sample;