[Scummvm-cvs-logs] scummvm master -> 4ff695524a71b81cdd682e33c44c5dac361a6130

[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:
4ff695524a SHERLOCK: RT: Fix order of drawing sprites and on-screen widgets


Commit: 4ff695524a71b81cdd682e33c44c5dac361a6130
    https://github.com/scummvm/scummvm/commit/4ff695524a71b81cdd682e33c44c5dac361a6130
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-30T08:32:58-04:00

Commit Message:
SHERLOCK: RT: Fix order of drawing sprites and on-screen widgets

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



diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 3a0888c..d41df5e 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -346,10 +346,10 @@ void TattooScene::doBgAnim() {
 
 	doBgAnimUpdateBgObjectsAndAnim();
 
-	ui.drawInterface();
-
 	doBgAnimDrawSprites();
 
+	ui.drawInterface();
+
 	if (vm._creditsActive)
 		vm.blitCredits();
 
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index fd94b2e..79a6eaf 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -294,9 +294,6 @@ void TattooUserInterface::drawInterface(int bufferNum) {
 	if (_widget)
 		_widget->draw();
 
-	// Handle drawing the text tooltip if necessary
-	_tooltipWidget.draw();
-
 	if (vm._creditsActive)
 		vm.drawCredits();
 
@@ -306,6 +303,9 @@ void TattooUserInterface::drawInterface(int bufferNum) {
 
 	if (screen._flushScreen)
 		screen.blockMove(_currentScroll);
+
+	// Handle drawing the text tooltip if necessary
+	_tooltipWidget.draw();
 }
 
 void TattooUserInterface::doBgAnimRestoreUI() {
diff --git a/engines/sherlock/tattoo/widget_base.cpp b/engines/sherlock/tattoo/widget_base.cpp
index b958053..0a53c55 100644
--- a/engines/sherlock/tattoo/widget_base.cpp
+++ b/engines/sherlock/tattoo/widget_base.cpp
@@ -80,7 +80,6 @@ void WidgetBase::draw() {
 		bounds.translate(currentScroll.x, currentScroll.y);
 
 		// Draw the background for the widget
-		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(bounds.left, bounds.top), bounds);
 		drawBackground();
 
 		// Draw the widget onto the back buffer and then slam it to the screen