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/inter_v6.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/inter_v6.cpp')
| -rw-r--r-- | engines/gob/inter_v6.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index c04f34d894..5f93f9af26 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -169,7 +169,7 @@ void Inter_v6::o6_playVmdOrMusic() { close = false; } - _vm->_vidPlayer->evaluateFlags(props); + _vm->_vidPlayer->evaluateFlags(props, true); int slot = 0; if ((fileName[0] != 0) && ((slot = _vm->_vidPlayer->openVideo(true, fileName, props)) < 0)) { @@ -177,11 +177,6 @@ void Inter_v6::o6_playVmdOrMusic() { return; } - if(!(props.flags & 0x1000) && !(props.flags & VideoPlayer::kFlagNoVideo)) - props.flags |= VideoPlayer::kFlagNonBlocking; - else - props.flags &= ~0x1000; - if (props.startFrame >= 0) _vm->_vidPlayer->play(slot, props); |