aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/inter_v6.cpp
diff options
context:
space:
mode:
authorSven Hesse2011-01-19 18:57:43 +0000
committerSven Hesse2011-01-19 18:57:43 +0000
commitbad7f1ce9a67e71eaaa390ac56ae5a3720c3fb7a (patch)
tree49de1da704aa8cfc8f65f4e551e7b7ec66e44b33 /engines/gob/inter_v6.cpp
parent878bedf454a8440b3d3c8887bc021a698dbb5605 (diff)
downloadscummvm-rg350-bad7f1ce9a67e71eaaa390ac56ae5a3720c3fb7a.tar.gz
scummvm-rg350-bad7f1ce9a67e71eaaa390ac56ae5a3720c3fb7a.tar.bz2
scummvm-rg350-bad7f1ce9a67e71eaaa390ac56ae5a3720c3fb7a.zip
GOB: Implement "live" (non-blocking) videos
Many thanks to SylvainTV. :) Urban Runner might actually be completeable now. One caveat: Hotspots at that hotel sequence are a bit glitchy... svn-id: r55333
Diffstat (limited to 'engines/gob/inter_v6.cpp')
-rw-r--r--engines/gob/inter_v6.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 9babcf9a45..0ae08dc387 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -176,10 +176,15 @@ 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);
- if (close)
+ if (close && !(props.flags & VideoPlayer::kFlagNonBlocking))
_vm->_vidPlayer->closeVideo(slot);
}