diff options
| author | athrxx | 2011-02-16 16:32:26 +0100 |
|---|---|---|
| committer | athrxx | 2011-02-16 16:32:26 +0100 |
| commit | 84db0f60b02414b2f223da190f2797cd9381df8d (patch) | |
| tree | a6236cfa19239dca5011622808db8a19fc4342e5 /engines | |
| parent | e23696d90077bbda05421a72ee3290bb00e52b22 (diff) | |
| parent | 145b0d83df1cbf6caecb61b5641bdf732fcf80e0 (diff) | |
| download | scummvm-rg350-84db0f60b02414b2f223da190f2797cd9381df8d.tar.gz scummvm-rg350-84db0f60b02414b2f223da190f2797cd9381df8d.tar.bz2 scummvm-rg350-84db0f60b02414b2f223da190f2797cd9381df8d.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/parallaction/graphics.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index 259ad84f69..79993a297a 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -152,9 +152,9 @@ void Palette::fadeTo(const Palette& target, uint step) { if (_data[i] == target._data[i]) continue; if (_data[i] < target._data[i]) - _data[i] = CLIP(_data[i] + step, (uint)0, (uint)target._data[i]); + _data[i] = CLIP(_data[i] + (int)step, (int)0, (int)target._data[i]); else - _data[i] = CLIP(_data[i] - step, (uint)target._data[i], (uint)255); + _data[i] = CLIP(_data[i] - (int)step, (int)target._data[i], (int)255); } return; |