diff options
author | Torbjörn Andersson | 2004-01-08 13:03:50 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2004-01-08 13:03:50 +0000 |
commit | 12cd552cab94537735aa6d89ce1ec1fd5dfa899e (patch) | |
tree | 027bbdd493a91e7e105c77fca4af1b721566beda /sword2/driver | |
parent | ac801f9828133b04d078eea21bcd0323905ecddc (diff) | |
download | scummvm-rg350-12cd552cab94537735aa6d89ce1ec1fd5dfa899e.tar.gz scummvm-rg350-12cd552cab94537735aa6d89ce1ec1fd5dfa899e.tar.bz2 scummvm-rg350-12cd552cab94537735aa6d89ce1ec1fd5dfa899e.zip |
Allow quitting during cutscenes and credits again. This is getting a bit
hackish...
svn-id: r12247
Diffstat (limited to 'sword2/driver')
-rw-r--r-- | sword2/driver/d_draw.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp index 86e431af72..52226f794e 100644 --- a/sword2/driver/d_draw.cpp +++ b/sword2/driver/d_draw.cpp @@ -233,7 +233,7 @@ int32 MoviePlayer::play(char *filename, MovieTextObject *text[], uint8 *musicOut KeyboardEvent ke; - if (_vm->_input->readKey(&ke) == RD_OK && ke.keycode == 27) { + if ((_vm->_input->readKey(&ke) == RD_OK && ke.keycode == 27) || _vm->_quit) { _vm->_mixer->stopHandle(handle); skipCutscene = true; break; @@ -252,8 +252,9 @@ int32 MoviePlayer::play(char *filename, MovieTextObject *text[], uint8 *musicOut // it's in use. while (handle.isActive()) { + _vm->_graphics->updateDisplay(false); _vm->_system->delay_msecs(100); - }; + } closeTextObject(text[textCounter]); |