thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BLADERUNNER: Skip movies on keydown not keyup (#1696)

Browse source 
* BLADERUNNER: Skip movies on keydown not keyup

* BLADERUNNER: Filter out key-repeats when skipping movies
This commit is contained in:
Tarek Soliman 2019-06-22 03:36:47 -05:00 • committed by Peter Kohaut
parent f3cdbd2ea9
commit 9d0de3e168
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/bladerunner/bladerunner.cpp
View file

@ -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;
}