diff options
| author | Torbjörn Andersson | 2013-01-04 02:27:56 +0100 |
|---|---|---|
| committer | Torbjörn Andersson | 2013-01-04 02:27:56 +0100 |
| commit | f93facaf45ba4eedb9f443c18c90892e06d9889b (patch) | |
| tree | bcfbbc9f10e071f42d1a8b3ce23e91aeccbd1b1f /engines/toltecs/toltecs.cpp | |
| parent | e0b75c59ea62e309f537f1000f9289ef91b40d22 (diff) | |
| download | scummvm-rg350-f93facaf45ba4eedb9f443c18c90892e06d9889b.tar.gz scummvm-rg350-f93facaf45ba4eedb9f443c18c90892e06d9889b.tar.bz2 scummvm-rg350-f93facaf45ba4eedb9f443c18c90892e06d9889b.zip | |
TOLTECS: Make aborting movies more reliable
Before, the main updateInput() might swallow attempts at aborting
movies. Now all events are handled by the movie player's own
handleInput(). As a side effect, it's no longer necessary to check
if a movie is playing before removing subtitles when pressing space.
Diffstat (limited to 'engines/toltecs/toltecs.cpp')
| -rw-r--r-- | engines/toltecs/toltecs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp index 0e71bd88f9..f6a2dfed9d 100644 --- a/engines/toltecs/toltecs.cpp +++ b/engines/toltecs/toltecs.cpp @@ -340,7 +340,7 @@ void ToltecsEngine::updateInput() { break; case Common::KEYCODE_SPACE: // Skip current dialog line, if a dialog is active - if (!_moviePlayer->isPlaying() && _screen->getTalkTextDuration() > 0) { + if (_screen->getTalkTextDuration() > 0) { _sound->stopSpeech(); _screen->finishTalkTextItems(); _keyState.reset(); // event consumed |