aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/tattoo/widget_verbs.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-07 21:25:55 -0400
committerPaul Gilbert2015-07-07 21:25:55 -0400
commited2caf7cd64ad16110dba763ebda8bbbdb69a244 (patch)
treefb81e1c4261172c9c3c9e34d2c2c1e141c4e23ff /engines/sherlock/tattoo/widget_verbs.cpp
parent47aa40104d11d92ea3c53390851e719d133fc7b9 (diff)
downloadscummvm-rg350-ed2caf7cd64ad16110dba763ebda8bbbdb69a244.tar.gz
scummvm-rg350-ed2caf7cd64ad16110dba763ebda8bbbdb69a244.tar.bz2
scummvm-rg350-ed2caf7cd64ad16110dba763ebda8bbbdb69a244.zip
SHERLOCK: RT: Fix display of verb menu in wide-screen scenes
Diffstat (limited to 'engines/sherlock/tattoo/widget_verbs.cpp')
-rw-r--r--engines/sherlock/tattoo/widget_verbs.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp
index fff984a3ff..ec18e3ce05 100644
--- a/engines/sherlock/tattoo/widget_verbs.cpp
+++ b/engines/sherlock/tattoo/widget_verbs.cpp
@@ -38,10 +38,10 @@ WidgetVerbs::WidgetVerbs(SherlockEngine *vm) : WidgetBase(vm) {
void WidgetVerbs::load(bool objectsOn) {
Events &events = *_vm->_events;
+ TattooPeople &people = *(TattooPeople *)_vm->_people;
Talk &talk = *_vm->_talk;
TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
- TattooPeople &people = *(TattooPeople *)_vm->_people;
- Common::Point mousePos = events.mousePos();
+ Common::Point mousePos = events.sceneMousePos();
bool isWatson = false;
if (talk._talkToAbort)
@@ -153,11 +153,9 @@ void WidgetVerbs::handleEvents() {
FixedText &fixedText = *_vm->_fixedText;
People &people = *_vm->_people;
TattooScene &scene = *(TattooScene *)_vm->_scene;
- Screen &screen = *_vm->_screen;
Talk &talk = *_vm->_talk;
TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
- Common::Point mousePos = events.mousePos();
- Common::Point scenePos = mousePos + screen._currentScroll;
+ Common::Point mousePos = events.sceneMousePos();
bool noDesc = false;
Common::String strLook = fixedText.getText(kFixedText_Look);
@@ -183,7 +181,7 @@ void WidgetVerbs::handleEvents() {
if (events._rightReleased) {
// Reset the selected shape to what was clicked on
- ui._bgFound = scene.findBgShape(scenePos);
+ ui._bgFound = scene.findBgShape(mousePos);
ui._personFound = ui._bgFound >= 1000;
Object *_bgShape = ui._personFound ? nullptr : &scene._bgShapes[ui._bgFound];
@@ -285,7 +283,7 @@ void WidgetVerbs::handleEvents() {
void WidgetVerbs::highlightVerbControls() {
Events &events = *_vm->_events;
Screen &screen = *_vm->_screen;
- Common::Point mousePos = events.mousePos();
+ Common::Point mousePos = events.sceneMousePos();
// Get highlighted verb
_selector = -1;