diff options
| author | Filippos Karapetis | 2008-09-03 09:55:29 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-09-03 09:55:29 +0000 |
| commit | 80c47666db27f4008dc5c2bc5ed2f42a9183af68 (patch) | |
| tree | 0df28a86136a73ae69463c3e709cc64bba681345 | |
| parent | 9691562987bd6381b581efb015d15d83d9f2084f (diff) | |
| download | scummvm-rg350-80c47666db27f4008dc5c2bc5ed2f42a9183af68.tar.gz scummvm-rg350-80c47666db27f4008dc5c2bc5ed2f42a9183af68.tar.bz2 scummvm-rg350-80c47666db27f4008dc5c2bc5ed2f42a9183af68.zip | |
Silence MSVC warning about ambiguous usage of CLIP
svn-id: r34296
| -rw-r--r-- | engines/made/screenfx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp index ee96af601a..6e9cf5c01a 100644 --- a/engines/made/screenfx.cpp +++ b/engines/made/screenfx.cpp @@ -132,7 +132,7 @@ void ScreenEffects::setBlendedPalette(byte *palette, byte *newPalette, int color 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); } } |