[Scummvm-git-logs] scummvm master -> 7485fc3f754a0faabf6fe99d0205cdbbabd0d526

[sev-]

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:
7485fc3f75 TUCKER: Fix color cycling in submarine room


Commit: 7485fc3f754a0faabf6fe99d0205cdbbabd0d526
    https://github.com/scummvm/scummvm/commit/7485fc3f754a0faabf6fe99d0205cdbbabd0d526
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-01-31T18:36:03+01:00

Commit Message:
TUCKER: Fix color cycling in submarine room

Fixes Trac#6378.

Changed paths:
    engines/tucker/locations.cpp


diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index b5fb10c..e337279 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -1791,11 +1791,14 @@ void TuckerEngine::execData3PreUpdate_locationNum29() {
 		const int d = _updateLocationFadePaletteCounter / 2;
 		uint8 scrollPal[5 * 3];
 		for (int i = 0; i < 5; ++i) {
-			scrollPal[i * 3]     = r[i + d];
-			scrollPal[i * 3 + 1] = g[i + d];
-			scrollPal[i * 3 + 2] = b[i + d];
+			// TODO: Why is this needed? 6-bit colors?
+			// Bug Trac#6378. Shift the palette two bits to the left.
+			scrollPal[i * 3 + 0] = r[i + d] << 2;
+			scrollPal[i * 3 + 1] = g[i + d] << 2;
+			scrollPal[i * 3 + 2] = b[i + d] << 2;
 		}
 		_system->getPaletteManager()->setPalette(scrollPal, 118, 5);
+
 		if (_flagsTable[143] == 1) {
 			_locationObjectsTable[2]._xPos = 999;
 			_locationObjectsTable[3]._xPos = 187;