[Scummvm-git-logs] scummvm master -> db836145c62b8a7f52de275aa5e4c5d557ede0fd

[bonki]

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:
db836145c6 Revert "TUCKER: Fix Bud drawn behind parts of statue in park"


Commit: db836145c62b8a7f52de275aa5e4c5d557ede0fd
    https://github.com/scummvm/scummvm/commit/db836145c62b8a7f52de275aa5e4c5d557ede0fd
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-02-09T23:26:31+01:00

Commit Message:
Revert "TUCKER: Fix Bud drawn behind parts of statue in park"

This fixed the statue but broke the park entrance which I had missed.

Changed paths:
    engines/tucker/tucker.cpp


diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 5e14f71..06c7368 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -1809,16 +1809,12 @@ void TuckerEngine::drawBackgroundSprites() {
 }
 
 void TuckerEngine::drawCurrentSprite() {
-	// WORKAROUND: original game glitch
-	// Skip first Bud frame drawing when entering location
-	// Fixes SF#2597763
+	// Workaround original game glitch: skip first bud frame drawing when entering location (tracker item #2597763)
 	if ((_locationNum == 17 || _locationNum == 18) && _currentSpriteAnimationFrame == 16) {
 		return;
 	}
-	// WORKAROUND: original game glitch
-	// Locations 14 and 61 contain some colors from [0xE0-0xF8] in a walkable area
-	// Fixes SF#3106542 and Trac#10423
-	const bool color248Only = (_locationNum == 14 || _locationNum == 61);
+	// Workaround original game glitch: location 14 contains some colors from [0xE0-0xF8] in a walkable area (tracker item #3106542)
+	const bool color248Only = (_locationNum == 14);
 	SpriteFrame *chr = &_spriteFramesTable[_currentSpriteAnimationFrame];
 	int yPos = _yPosCurrent + _mainSpritesBaseOffset - 54 + chr->_yOffset;
 	int xPos = _xPosCurrent;