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

lordhoto lordhoto at gmail.com
Sat Sep 3 13:52:12 CEST 2011


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

Summary:
44bc1bff06 SCUMM: Limit Indy4 Amiga specific code to that version.
f85fd9b4f1 SCUMM: Fix text color bug in Indy4 Amiga outro.


Commit: 44bc1bff0691ea085bd4619de6f611d9f0106493
    https://github.com/scummvm/scummvm/commit/44bc1bff0691ea085bd4619de6f611d9f0106493
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2011-09-03T04:41:57-07:00

Commit Message:
SCUMM: Limit Indy4 Amiga specific code to that version.

Changed paths:
    engines/scumm/palette.cpp



diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 7a6be90..64f40b9 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -584,10 +584,12 @@ void ScummEngine::stopCycle(int i) {
 	assertRange(0, i, 16, "stopCycle: cycle");
 	if (i != 0) {
 		_colorCycle[i - 1].delay = 0;
-		cycl = &_colorCycle[i - 1];
-		for (int j = cycl->start; j <= cycl->end && j < 32; ++j) {
-			_shadowPalette[j] = j;
-			_colorUsedByCycle[j] = 0;
+		if (_game.platform == Common::kPlatformAmiga && _game.id == GID_INDY4) {
+			cycl = &_colorCycle[i - 1];
+			for (int j = cycl->start; j <= cycl->end && j < 32; ++j) {
+				_shadowPalette[j] = j;
+				_colorUsedByCycle[j] = 0;
+			}
 		}
 		return;
 	}


Commit: f85fd9b4f1168bcf0659ef6cf747c6616408921c
    https://github.com/scummvm/scummvm/commit/f85fd9b4f1168bcf0659ef6cf747c6616408921c
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2011-09-03T04:48:06-07:00

Commit Message:
SCUMM: Fix text color bug in Indy4 Amiga outro.

Changed paths:
    engines/scumm/palette.cpp



diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 64f40b9..2c10758 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -913,7 +913,7 @@ void ScummEngine::darkenPalette(int redScale, int greenScale, int blueScale, int
 		const byte *palptr = getPalettePtr(_curPalIndex, _roomResource) + startColor * 3;
 
 		for (int i = startColor; i <= endColor; ++i) {
-			if (i >= 16 && i < 48) {
+			if (i > 16 && i < 48) {
 				if (cycleFlag)
 					_colorUsedByCycle[i - 16] &= ~2;
 				else






More information about the Scummvm-git-logs mailing list