diff options
| author | Sven Hesse | 2011-01-22 11:39:03 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-22 11:39:03 +0000 |
| commit | 6e254c4f010a6b4f1ff49297e073d1ee59cafbb6 (patch) | |
| tree | 2e218673ec39a2a800a269b819d8fa1a8dcab87e /engines/gob/inter_v6.cpp | |
| parent | 86b90fe8a69868d1b28009e36730523652a69d17 (diff) | |
| download | scummvm-rg350-6e254c4f010a6b4f1ff49297e073d1ee59cafbb6.tar.gz scummvm-rg350-6e254c4f010a6b4f1ff49297e073d1ee59cafbb6.tar.bz2 scummvm-rg350-6e254c4f010a6b4f1ff49297e073d1ee59cafbb6.zip | |
GOB: Actually, startFrame == -2 seems to be the only live video flag
svn-id: r55418
Diffstat (limited to 'engines/gob/inter_v6.cpp')
| -rw-r--r-- | engines/gob/inter_v6.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index 01301ebe0a..77affee141 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -167,11 +167,11 @@ void Inter_v6::o6_playVmdOrMusic() { if (props.startFrame == -2) { props.startFrame = 0; - props.lastFrame = -1; - props.flags &= ~0x1000; + props.lastFrame = -1; + props.noBlock = true; } - _vm->_vidPlayer->evaluateFlags(props, true); + _vm->_vidPlayer->evaluateFlags(props); int slot = 0; if ((fileName[0] != 0) && ((slot = _vm->_vidPlayer->openVideo(true, fileName, props)) < 0)) { @@ -182,7 +182,7 @@ void Inter_v6::o6_playVmdOrMusic() { if (props.startFrame >= 0) _vm->_vidPlayer->play(slot, props); - if (close && !(props.flags & VideoPlayer::kFlagNonBlocking)) { + if (close && !props.noBlock) { if ((props.flags & VideoPlayer::kFlagNoVideo) && (!props.canceled)) _vm->_util->longDelay(500); |