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

[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:
e5f00747ed SHERLOCK: RT: Fix display of tooltip for on-screen objects


Commit: e5f00747edd143512c48f5ac48f68841cb280ee9
    https://github.com/scummvm/scummvm/commit/e5f00747edd143512c48f5ac48f68841cb280ee9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-15T20:07:20-04:00

Commit Message:
SHERLOCK: RT: Fix display of tooltip for on-screen objects

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



diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index cd625ba..633792a 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -232,6 +232,7 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_doBgAnimDone = true;
 	_tempFadeStyle = 0;
 	_exitZone = -1;
+	_doBgAnimDone = false;
 }
 
 Scene::~Scene() {
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 477739a..62514dd 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -465,7 +465,7 @@ void TattooScene::doBgAnim() {
 		events.wait(3);
 
 	screen._flushScreen = false;
-	_doBgAnimDone = false;
+	_doBgAnimDone = true;
 	ui._drawMenu = false;
 
 	for (int idx = 1; idx < MAX_CHARACTERS; ++idx) {
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index f51c57a..7d7d942 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -56,7 +56,7 @@ void TattooUserInterface::handleInput() {
 	TattooEngine &vm = *(TattooEngine *)_vm;
 	Events &events = *_vm->_events;
 	TattooScene &scene = *(TattooScene *)_vm->_scene;
-	Common::Point mousePos = events.mousePos();
+	Common::Point mousePos = events.mousePos() + _currentScroll;
 
 	events.pollEventsAndWait();
 	_keyState.keycode = Common::KEYCODE_INVALID;