aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorBastien Bouclet2011-01-18 19:30:32 +0000
committerBastien Bouclet2011-01-18 19:30:32 +0000
commitf343bb9185461a94489b6abd33eaf037de879d32 (patch)
tree8d078362193905a627979a118429fc2bf92e6d2c /engines
parentda1669c6669b31a3a7dd8cb09019081651b223fc (diff)
downloadscummvm-rg350-f343bb9185461a94489b6abd33eaf037de879d32.tar.gz
scummvm-rg350-f343bb9185461a94489b6abd33eaf037de879d32.tar.bz2
scummvm-rg350-f343bb9185461a94489b6abd33eaf037de879d32.zip
MOHAWK: Add a workaround to prevent a crash when pulling the gears puzzle reset lever in Myst ME.
CL1WLFCH.MOV is not the same for Myst ME and Myst win31. The proper fix will need backwards playing for QT movies. svn-id: r55310
Diffstat (limited to 'engines')
-rw-r--r--engines/mohawk/myst_stacks/myst.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index 567cfd0843..9120e77b7b 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -3002,10 +3002,15 @@ void MystScriptParser_Myst::clockReset() {
void MystScriptParser_Myst::clockResetWeight() {
// Set video bounds, weight going up
- _clockWeightVideo = _vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
- _vm->_video->setVideoBounds(_clockWeightVideo,
- Graphics::VideoTimestamp(2214 * 2 - _clockWeightPosition, 600),
- Graphics::VideoTimestamp(2214 * 2, 600));
+ if (!(_vm->getFeatures() & GF_ME)) {
+ _clockWeightVideo = _vm->_video->playBackgroundMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
+ _vm->_video->setVideoBounds(_clockWeightVideo,
+ Graphics::VideoTimestamp(2214 * 2 - _clockWeightPosition, 600),
+ Graphics::VideoTimestamp(2214 * 2, 600));
+ } else {
+ //FIXME: Needs QT backwards playing
+ warning("Weight going back up not implemented");
+ }
// Reset position
_clockWeightPosition = 0;