diff options
| author | Max Horn | 2002-12-13 17:12:02 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-13 17:12:02 +0000 |
| commit | 645c5418d6d3618a0cbab36a1a4c480d722246e0 (patch) | |
| tree | d8a8ef554069da69b84ee97716e0ad32ba5dc77d /scumm | |
| parent | fc124552b8d55f975e60911100bd0d56dfdadd15 (diff) | |
| download | scummvm-rg350-645c5418d6d3618a0cbab36a1a4c480d722246e0.tar.gz scummvm-rg350-645c5418d6d3618a0cbab36a1a4c480d722246e0.tar.bz2 scummvm-rg350-645c5418d6d3618a0cbab36a1a4c480d722246e0.zip | |
cleanup
svn-id: r5933
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 147bded726..437fda4a17 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1455,7 +1455,8 @@ void Scumm::updatePalette() { int num = _palDirtyMax - first + 1; int i; - byte palette_colors[1024],*p = palette_colors; + byte palette_colors[1024]; + byte *p = palette_colors; for (i = _palDirtyMin; i <= _palDirtyMax; i++) { byte *data; @@ -1469,18 +1470,18 @@ void Scumm::updatePalette() { // before uploading them to the backend. if (noir_mode) { - double r, g, b; - double brightness; + int r, g, b; + byte brightness; - r = (double) data[0]; - g = (double) data[1]; - b = (double) data[2]; + r = data[0]; + g = data[1]; + b = data[2]; - brightness = (0.299 * r + 0.587 * g + 0.114 * b) + 0.5; + brightness = (byte)((0.299 * r + 0.587 * g + 0.114 * b) + 0.5); - *p++ = (byte) brightness; - *p++ = (byte) brightness; - *p++ = (byte) brightness; + *p++ = brightness; + *p++ = brightness; + *p++ = brightness; *p++ = 0; } else { *p++ = data[0]; |