diff options
| author | Sven Hesse | 2011-01-22 19:37:25 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-22 19:37:25 +0000 |
| commit | 00cabdad11ea7b2bac21eb0e06aa99d325be31b5 (patch) | |
| tree | a32ce4e0ae90a1f5b832be0ac7430bf74a2afd8b /engines/gob/inter_v6.cpp | |
| parent | 0722df94721e6e356bd126bdb97f51b9a4a0ef1e (diff) | |
| download | scummvm-rg350-00cabdad11ea7b2bac21eb0e06aa99d325be31b5.tar.gz scummvm-rg350-00cabdad11ea7b2bac21eb0e06aa99d325be31b5.tar.bz2 scummvm-rg350-00cabdad11ea7b2bac21eb0e06aa99d325be31b5.zip | |
GOB: Only let one video with sound play at a time
svn-id: r55444
Diffstat (limited to 'engines/gob/inter_v6.cpp')
| -rw-r--r-- | engines/gob/inter_v6.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index 8e74ed42f1..a9262d7c37 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -175,10 +175,8 @@ void Inter_v6::o6_playVmdOrMusic() { _vm->_vidPlayer->evaluateFlags(props); bool primary = true; - if (props.noBlock && (props.flags & VideoPlayer::kFlagNoVideo)) { - _vm->_vidPlayer->closeLiveSound(); + if (props.noBlock && (props.flags & VideoPlayer::kFlagNoVideo)) primary = false; - } int slot = 0; if ((fileName[0] != 0) && ((slot = _vm->_vidPlayer->openVideo(primary, fileName, props)) < 0)) { @@ -186,6 +184,9 @@ void Inter_v6::o6_playVmdOrMusic() { return; } + if (props.hasSound) + _vm->_vidPlayer->closeLiveSound(); + if (props.startFrame >= 0) _vm->_vidPlayer->play(slot, props); |