aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2007-08-21 14:59:02 +0000
committerFilippos Karapetis2007-08-21 14:59:02 +0000
commit44f73a1b7cab5b145c5c74347f8b761d6fdfe2be (patch)
tree4d71e09f25075916bf1e3c86e7b49dca9844ee3f /engines
parent96e0eeb94d54374152603d5992595226e9e07e8c (diff)
downloadscummvm-rg350-44f73a1b7cab5b145c5c74347f8b761d6fdfe2be.tar.gz
scummvm-rg350-44f73a1b7cab5b145c5c74347f8b761d6fdfe2be.tar.bz2
scummvm-rg350-44f73a1b7cab5b145c5c74347f8b761d6fdfe2be.zip
Simplified blackToPal
svn-id: r28686
Diffstat (limited to 'engines')
-rw-r--r--engines/saga/gfx.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp
index 56ffe04c96..92d55841bb 100644
--- a/engines/saga/gfx.cpp
+++ b/engines/saga/gfx.cpp
@@ -356,8 +356,6 @@ void Gfx::blackToPal(PalEntry *srcPal, double percent) {
// Exponential fade
fpercent = percent * percent;
- fpercent = 1.0 - fpercent;
-
// Use the correct percentage change per frame for each palette entry
for (i = 0, ppal = _currentPal; i < PAL_ENTRIES; i++, ppal += 4) {
if (i < from || i >= from + numcolors)
@@ -365,7 +363,7 @@ void Gfx::blackToPal(PalEntry *srcPal, double percent) {
else
palE = &srcPal[i];
- new_entry = (int)(palE->red - palE->red * fpercent);
+ new_entry = (int)(palE->red * fpercent);
if (new_entry < 0) {
ppal[0] = 0;
@@ -373,7 +371,7 @@ void Gfx::blackToPal(PalEntry *srcPal, double percent) {
ppal[0] = (byte)new_entry;
}
- new_entry = (int)(palE->green - palE->green * fpercent);
+ new_entry = (int)(palE->green * fpercent);
if (new_entry < 0) {
ppal[1] = 0;
@@ -381,7 +379,7 @@ void Gfx::blackToPal(PalEntry *srcPal, double percent) {
ppal[1] = (byte) new_entry;
}
- new_entry = (int)(palE->blue - palE->blue * fpercent);
+ new_entry = (int)(palE->blue * fpercent);
if (new_entry < 0) {
ppal[2] = 0;