diff options
| author | Niv Baehr | 2019-07-30 22:25:14 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-07-30 22:25:14 +0300 |
| commit | 0377045f0e27d60a5488bbc095b42866104f801d (patch) | |
| tree | e7927199fa8b4d7e1881b314de8d1372ce351be2 | |
| parent | cffd6d79abe613201db64995bf4779edc77c9858 (diff) | |
| download | scummvm-rg350-0377045f0e27d60a5488bbc095b42866104f801d.tar.gz scummvm-rg350-0377045f0e27d60a5488bbc095b42866104f801d.tar.bz2 scummvm-rg350-0377045f0e27d60a5488bbc095b42866104f801d.zip | |
QUEEN: Skip talk on right click
| -rw-r--r-- | engines/queen/input.cpp | 7 | ||||
| -rw-r--r-- | engines/queen/talk.cpp | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 1cce9ad6d1..4c400fbe40 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -111,15 +111,22 @@ void Input::delay(uint amount) { case Common::EVENT_LBUTTONDOWN: _mouseButton |= MOUSE_LBUTTON; + if (_dialogueRunning) + _talkQuit = true; break; case Common::EVENT_RBUTTONDOWN: _mouseButton |= MOUSE_RBUTTON; + if (_dialogueRunning) + _talkQuit = true; break; case Common::EVENT_RTL: case Common::EVENT_QUIT: if (_cutawayRunning) _cutawayQuit = true; + // Allow using close button while dialogue is running + if (_dialogueRunning) + _talkQuit = true; return; default: diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index e86a53d448..b7f61ad266 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -734,8 +734,10 @@ void Talk::defaultAnimation( _vm->update(); } - if (_vm->input()->talkQuit()) + if (_vm->input()->talkQuit()) { + _vm->sound()->stopSpeech(); break; + } if (_vm->logic()->joeWalk() == JWM_SPEAK) { _vm->update(); |