[Scummvm-cvs-logs] scummvm master -> 5fd764c221bbbfa7f075862d310bb7098184c4dc

[dreammaster]

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:
5fd764c221 SHERLOCK: RT: Fix dialog background shading data after viewing journal


Commit: 5fd764c221bbbfa7f075862d310bb7098184c4dc
    https://github.com/scummvm/scummvm/commit/5fd764c221bbbfa7f075862d310bb7098184c4dc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-22T09:42:53-04:00

Commit Message:
SHERLOCK: RT: Fix dialog background shading data after viewing journal

Changed paths:
    engines/sherlock/tattoo/tattoo_user_interface.cpp



diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 6ede31d..76d1af1 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -216,7 +216,9 @@ void TattooUserInterface::doJournal() {
 	TattooJournal &journal = *(TattooJournal *)_vm->_journal;
 	TattooScene &scene = *(TattooScene *)_vm->_scene;
 	Screen &screen = *_vm->_screen;
+	byte lookupTable[PALETTE_SIZE];
 
+	Common::copy(&_lookupTable[0], &_lookupTable[PALETTE_SIZE], &lookupTable[0]);
 	_menuMode = JOURNAL_MODE;
 	journal.show();
 
@@ -224,10 +226,12 @@ void TattooUserInterface::doJournal() {
 	_windowOpen = false;
 	_key = -1;
 
-	setupBGArea(screen._cMap);
+	// Restore the the old screen palette and greyscale lookup table
 	screen.clear();
 	screen.setPalette(screen._cMap);
+	Common::copy(&lookupTable[0], &lookupTable[PALETTE_SIZE], &_lookupTable[0]);
 
+	// Restore the scene
 	screen._backBuffer1.blitFrom(screen._backBuffer2);
 	scene.updateBackground();
 	screen.slamArea(screen._currentScroll.x, screen._currentScroll.y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);