diff options
author | Torbjörn Andersson | 2008-09-27 17:51:22 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2008-09-27 17:51:22 +0000 |
commit | 3779fc2170d93514735b18f876f39aaf4985b9f0 (patch) | |
tree | 743f2600ba10ca525eaa8cb8bb4184c868196ac7 | |
parent | 46a5320f0d5898cc3a039355ce4950754ab6998c (diff) | |
download | scummvm-rg350-3779fc2170d93514735b18f876f39aaf4985b9f0.tar.gz scummvm-rg350-3779fc2170d93514735b18f876f39aaf4985b9f0.tar.bz2 scummvm-rg350-3779fc2170d93514735b18f876f39aaf4985b9f0.zip |
Slight simplification of last commit.
svn-id: r34658
-rw-r--r-- | engines/sword1/animation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index dd5ee1bbb0..eb6b6d4dca 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -265,7 +265,7 @@ void MoviePlayer::play(void) { _currentFrame = 0; bool terminated = false; Common::EventManager *eventMan = _system->getEventManager(); - while (!terminated && decodeFrame() && !_vm->quit()) { + while (!terminated && decodeFrame()) { if (!_movieTexts.empty()) { if (_currentFrame == _movieTexts[0]->_startFrame) { _textMan->makeTextSprite(2, (uint8 *)_movieTexts[0]->_text, 600, LETTER_COL); @@ -295,18 +295,18 @@ void MoviePlayer::play(void) { handleScreenChanged(); break; case Common::EVENT_KEYDOWN: - if (event.kbd.keycode == Common::KEYCODE_ESCAPE) { - _snd->stopHandle(_bgSoundHandle); + if (event.kbd.keycode == Common::KEYCODE_ESCAPE) terminated = true; - } break; default: break; } } + if (_vm->quit()) + terminated = true; } - if (_vm->quit()) + if (terminated) _snd->stopHandle(_bgSoundHandle); while (!_movieTexts.empty()) { |