[Scummvm-cvs-logs] scummvm master -> c06bf58217a331b7563ecda4484dfb016d3087f8

eriktorbjorn eriktorbjorn at telia.com
Sun Jul 19 20:34:36 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c06bf58217 MADE: Fix palette fade in/out


Commit: c06bf58217a331b7563ecda4484dfb016d3087f8
    https://github.com/scummvm/scummvm/commit/c06bf58217a331b7563ecda4484dfb016d3087f8
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-07-19T20:32:06+02:00

Commit Message:
MADE: Fix palette fade in/out

The final palette wasn't set so, for instance, at the beginning of
the RTZ intro the Infocom logo wouldn't completely fade to back. I
think this is the correcet fix for that.

Changed paths:
    engines/made/screenfx.cpp



diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp
index 3f98cbb..bae59f0 100644
--- a/engines/made/screenfx.cpp
+++ b/engines/made/screenfx.cpp
@@ -201,7 +201,7 @@ void ScreenEffects::startBlendedPalette(byte *palette, byte *newPalette, int col
 }
 
 void ScreenEffects::stepBlendedPalette() {
-	if (_blendedPaletteStatus._active && _blendedPaletteStatus._value < _blendedPaletteStatus._maxValue) {
+	if (_blendedPaletteStatus._active && _blendedPaletteStatus._value <= _blendedPaletteStatus._maxValue) {
 		setBlendedPalette(_blendedPaletteStatus._palette, _blendedPaletteStatus._newPalette,
 			_blendedPaletteStatus._colorCount, _blendedPaletteStatus._value, _blendedPaletteStatus._maxValue);
 		if (_blendedPaletteStatus._value == _blendedPaletteStatus._maxValue)






More information about the Scummvm-git-logs mailing list