[Scummvm-cvs-logs] SF.net SVN: scummvm:[34296] scummvm/trunk/engines/made/screenfx.cpp

[thebluegr at users.sourceforge.net]

Revision: 34296
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34296&view=rev
Author:   thebluegr
Date:     2008-09-03 09:55:29 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
Silence MSVC warning about ambiguous usage of CLIP

Modified Paths:
--------------
    scummvm/trunk/engines/made/screenfx.cpp

Modified: scummvm/trunk/engines/made/screenfx.cpp
===================================================================
--- scummvm/trunk/engines/made/screenfx.cpp	2008-09-03 09:03:21 UTC (rev 34295)
+++ scummvm/trunk/engines/made/screenfx.cpp	2008-09-03 09:55:29 UTC (rev 34296)
@@ -132,7 +132,7 @@
 	if (!_screen->isPaletteLocked()) {
 		int32 mulValue = (value * 64) / maxValue;
 		for (int i = 0; i < colorCount * 3; i++)
-			_fxPalette[i] = CLIP(newPalette[i] - (newPalette[i] - palette[i]) * mulValue / 64, 0, 255);
+			_fxPalette[i] = CLIP<int32>(newPalette[i] - (newPalette[i] - palette[i]) * mulValue / 64, 0, 255);
 		_screen->setRGBPalette(_fxPalette, 0, 256);
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.