diff options
| author | Sven Hesse | 2011-01-20 15:29:32 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-20 15:29:32 +0000 |
| commit | adf8820aee35ce2fa38b5420aab50461653f705f (patch) | |
| tree | 4e8876a9324b20443a00fedb7442efa65b17c2b3 /engines/gob/videoplayer.cpp | |
| parent | 862596bbd4a5158a32ef07aff19e52f42ba03e83 (diff) | |
| download | scummvm-rg350-adf8820aee35ce2fa38b5420aab50461653f705f.tar.gz scummvm-rg350-adf8820aee35ce2fa38b5420aab50461653f705f.tar.bz2 scummvm-rg350-adf8820aee35ce2fa38b5420aab50461653f705f.zip | |
GOB: Make blocking videos default
svn-id: r55354
Diffstat (limited to 'engines/gob/videoplayer.cpp')
| -rw-r--r-- | engines/gob/videoplayer.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index c9dae63fa5..2c779b512d 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -74,7 +74,7 @@ VideoPlayer::~VideoPlayer() { _videoSlots[i].close(); } -void VideoPlayer::evaluateFlags(Properties &properties) { +void VideoPlayer::evaluateFlags(Properties &properties, bool allowNonBlock) { if (properties.flags & kFlagFrontSurface) { properties.sprite = Draw::kFrontSurface; } else if (properties.flags & kFlagOtherSurface) { @@ -87,6 +87,14 @@ void VideoPlayer::evaluateFlags(Properties &properties) { } else { properties.sprite = Draw::kBackSurface; } + + if (allowNonBlock) { + if(!(properties.flags & 0x1000) && !(properties.flags & kFlagNoVideo)) + properties.flags |= kFlagNonBlocking; + else + properties.flags &= ~0x1000; + } else + properties.flags &= ~0x1000; } int VideoPlayer::openVideo(bool primary, const Common::String &file, Properties &properties) { |