aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2015-06-15 20:07:20 -0400
committerPaul Gilbert2015-06-15 20:07:20 -0400
commite5f00747edd143512c48f5ac48f68841cb280ee9 (patch)
treea2e9854d28d84bf7973069e638e04c01c9190ca5 /engines
parentf02488fc2058994b36116c7ce7daf756e4c94984 (diff)
downloadscummvm-rg350-e5f00747edd143512c48f5ac48f68841cb280ee9.tar.gz
scummvm-rg350-e5f00747edd143512c48f5ac48f68841cb280ee9.tar.bz2
scummvm-rg350-e5f00747edd143512c48f5ac48f68841cb280ee9.zip
SHERLOCK: RT: Fix display of tooltip for on-screen objects
Diffstat (limited to 'engines')
-rw-r--r--engines/sherlock/scene.cpp1
-rw-r--r--engines/sherlock/tattoo/tattoo_scene.cpp2
-rw-r--r--engines/sherlock/tattoo/tattoo_user_interface.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index cd625bab87..633792aade 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 477739af63..62514dd018 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 f51c57a8c0..7d7d9420da 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;