[Scummvm-cvs-logs] scummvm master -> 479eeb7e47e8bb27551ba49f7d37c36b3b1b88ee

DrMcCoy drmccoy at drmccoy.de
Fri Aug 26 05:13:00 CEST 2011


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:
479eeb7e47 GOB: Actually, we do support 16 color fading


Commit: 479eeb7e47e8bb27551ba49f7d37c36b3b1b88ee
    https://github.com/scummvm/scummvm/commit/479eeb7e47e8bb27551ba49f7d37c36b3b1b88ee
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-08-25T20:00:28-07:00

Commit Message:
GOB: Actually, we do support 16 color fading

Changed paths:
    engines/gob/palanim.cpp



diff --git a/engines/gob/palanim.cpp b/engines/gob/palanim.cpp
index 42aeaf6..8a5327c 100644
--- a/engines/gob/palanim.cpp
+++ b/engines/gob/palanim.cpp
@@ -79,9 +79,6 @@ bool PalAnim::fadeStep(int16 oper) {
 	byte newGreen;
 	byte newBlue;
 
-	if (_vm->_global->_colorCount != 256)
-		error("PalAnim::fadeStep(): Only 256 color mode is supported");
-
 	if (oper == 0) {
 		if (_vm->_global->_setAllPalette) {
 			if (_vm->_global->_inVM != 0)
@@ -134,12 +131,6 @@ void PalAnim::fade(Video::PalDesc *palDesc, int16 fadeV, int16 allColors) {
 
 	_fadeValue = (fadeV < 0) ? -fadeV : 2;
 
-	if (_vm->_global->_colorCount < 256) {
-		if (palDesc)
-			_vm->_video->setFullPalette(palDesc);
-		return;
-	}
-
 	if (!_vm->_global->_setAllPalette) {
 		if (!palDesc) {
 			for (i = 0; i < 16; i++) {






More information about the Scummvm-git-logs mailing list