aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-04-25 10:22:38 +0000
committerTravis Howell2005-04-25 10:22:38 +0000
commit93279ff29e82973dbcf117fe98ba325dfab5cb8d (patch)
tree3a1df780a380267070330c78a2254501e327acb9 /scumm
parent8e3672852687902b7f6c6742341922cd833abdba (diff)
downloadscummvm-rg350-93279ff29e82973dbcf117fe98ba325dfab5cb8d.tar.gz
scummvm-rg350-93279ff29e82973dbcf117fe98ba325dfab5cb8d.tar.bz2
scummvm-rg350-93279ff29e82973dbcf117fe98ba325dfab5cb8d.zip
Minor cleanup
svn-id: r17800
Diffstat (limited to 'scumm')
-rw-r--r--scumm/palette_he.cpp55
1 files changed, 26 insertions, 29 deletions
diff --git a/scumm/palette_he.cpp b/scumm/palette_he.cpp
index ab564020bf..584d683e0e 100644
--- a/scumm/palette_he.cpp
+++ b/scumm/palette_he.cpp
@@ -236,35 +236,32 @@ void ScummEngine_v99he::setPaletteFromPtr(const byte *ptr, int numcolor) {
}
void ScummEngine_v99he::darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor) {
- if (startColor <= endColor) {
- uint8 *src, *dest;
- int color, j;
-
- for (j = startColor; j <= endColor; j++) {
- src = _hePalettes + j * 3;
- dest = src + 1024;
-
- color = *src++;
- color = color * redScale / 0xFF;
- if (color > 255)
- color = 255;
- *dest++ = color;
-
- color = *src++;
- color = color * greenScale / 0xFF;
- if (color > 255)
- color = 255;
- *dest++ = color;
-
- color = *src++;
- color = color * blueScale / 0xFF;
- if (color > 255)
- color = 255;
- *dest++ = color;
-
- _hePalettes[1792 + j] = j;
- setDirtyColors(j, endColor);
- }
+ uint8 *src, *dst;
+ int color, j;
+
+ src = _hePalettes + startColor * 3;
+ dst = _hePalettes + 1024 + startColor * 3;
+ for (j = startColor; j <= endColor; j++) {
+ color = *src++;
+ color = color * redScale / 0xFF;
+ if (color > 255)
+ color = 255;
+ *dst++ = color;
+
+ color = *src++;
+ color = color * greenScale / 0xFF;
+ if (color > 255)
+ color = 255;
+ *dst++ = color;
+
+ color = *src++;
+ color = color * blueScale / 0xFF;
+ if (color > 255)
+ color = 255;
+ *dst++ = color;
+
+ _hePalettes[1792 + j] = j;
+ setDirtyColors(j, endColor);
}
}