aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsluicebox2019-12-01 15:09:57 -0800
committersluicebox2019-12-01 15:09:57 -0800
commitb6692ac7831a9475fd23f104145254d8dd507c27 (patch)
tree7b278be9d79e07d0716cbfaff56731760813a55b
parent01772497b7762ac2cf8949ca7904112b7fc25206 (diff)
downloadscummvm-rg350-b6692ac7831a9475fd23f104145254d8dd507c27.tar.gz
scummvm-rg350-b6692ac7831a9475fd23f104145254d8dd507c27.tar.bz2
scummvm-rg350-b6692ac7831a9475fd23f104145254d8dd507c27.zip
SCI32: Fix kPlayVMDPlayUntilEvent when passed zero
Fixes VMD playback in Phantasmagoria 1 while in censored mode. kPlayVMDPlayUntilEvent is supposed to play until the last frame when passed zero as the frame number to wait for.
-rw-r--r--engines/sci/graphics/video32.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index 0efb2570a0..e6e594b211 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -671,7 +671,7 @@ VMDPlayer::EventFlags VMDPlayer::kernelPlayUntilEvent(const EventFlags flags, co
const int32 maxFrameNo = _decoder->getFrameCount() - 1;
- if (flags & kEventFlagToFrame) {
+ if ((flags & kEventFlagToFrame) && lastFrameNo) {
_yieldFrame = MIN<int32>(lastFrameNo, maxFrameNo);
} else {
_yieldFrame = maxFrameNo;