diff options
| author | Paul Gilbert | 2015-05-04 13:22:43 -1000 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-04 13:22:43 -1000 |
| commit | 8a9467b09aab38649a891934c17a7b15608ddf0a (patch) | |
| tree | 450ac4c4227f0b7884dd9c4078387f07f2f2c371 | |
| parent | 0554e893cef70dc7fd4bbdad8227d17b14d076d1 (diff) | |
| download | scummvm-rg350-8a9467b09aab38649a891934c17a7b15608ddf0a.tar.gz scummvm-rg350-8a9467b09aab38649a891934c17a7b15608ddf0a.tar.bz2 scummvm-rg350-8a9467b09aab38649a891934c17a7b15608ddf0a.zip | |
SHERLOCK: Check _talkToAbort after calling pickupObject
| -rw-r--r-- | engines/sherlock/user_interface.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp index 93dd03316d..d40e1cced1 100644 --- a/engines/sherlock/user_interface.cpp +++ b/engines/sherlock/user_interface.cpp @@ -1508,6 +1508,7 @@ void UserInterface::doMiscControl(int allowed) { void UserInterface::doPickControl() { Events &events = *_vm->_events; Scene &scene = *_vm->_scene; + Talk &talk = *_vm->_talk; if (events._released) { if ((_temp = _bgFound) != -1) { @@ -1517,7 +1518,7 @@ void UserInterface::doPickControl() { if (_bgFound < 1000) { scene._bgShapes[_bgFound].pickUpObject(MPICK); - if (_menuMode != TALK_MODE) { + if (!talk._talkToAbort && _menuMode != TALK_MODE) { _key = _oldKey = -1; _menuMode = STD_MODE; restoreButton(PICKUP_MODE - 1); |