diff options
| author | Tarek Soliman | 2019-06-22 03:36:47 -0500 |
|---|---|---|
| committer | Peter Kohaut | 2019-06-22 10:36:47 +0200 |
| commit | 9d0de3e168f4975ba2974ac71031fffdd008819f (patch) | |
| tree | 025267461adc0b7e11b65b1f543c6ff5d25e2232 /engines/bladerunner/bladerunner.cpp | |
| parent | f3cdbd2ea9bf65ab50bfa8bb6d0ea66c22704e5d (diff) | |
| download | scummvm-rg350-9d0de3e168f4975ba2974ac71031fffdd008819f.tar.gz scummvm-rg350-9d0de3e168f4975ba2974ac71031fffdd008819f.tar.bz2 scummvm-rg350-9d0de3e168f4975ba2974ac71031fffdd008819f.zip | |
BLADERUNNER: Skip movies on keydown not keyup (#1696)
* BLADERUNNER: Skip movies on keydown not keyup
* BLADERUNNER: Filter out key-repeats when skipping movies
Diffstat (limited to 'engines/bladerunner/bladerunner.cpp')
| -rw-r--r-- | engines/bladerunner/bladerunner.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp index 819adab552..0288af3c22 100644 --- a/engines/bladerunner/bladerunner.cpp +++ b/engines/bladerunner/bladerunner.cpp @@ -1163,13 +1163,6 @@ void BladeRunnerEngine::handleKeyUp(Common::Event &event) { return; } - if (_vqaIsPlaying && (event.kbd.keycode == Common::KEYCODE_ESCAPE || (event.kbd.keycode == Common::KEYCODE_RETURN && event.kbd.flags == 0))) { - _vqaStopIsRequested = true; - _vqaIsPlaying = false; - - return; - } - if (!playerHasControl() || _isWalkingInterruptible) { return; } @@ -1225,6 +1218,13 @@ void BladeRunnerEngine::handleKeyDown(Common::Event &event) { return; } + if (_vqaIsPlaying && !event.kbdRepeat && (event.kbd.keycode == Common::KEYCODE_ESCAPE || event.kbd.keycode == Common::KEYCODE_RETURN)) { + _vqaStopIsRequested = true; + _vqaIsPlaying = false; + + return; + } + if (!playerHasControl() || _isWalkingInterruptible || _actorIsSpeaking || _vqaIsPlaying) { return; } |