[Scummvm-cvs-logs] SF.net SVN: scummvm:[55310] scummvm/trunk/engines/mohawk/myst_stacks/myst. cpp

bgk at users.sourceforge.net bgk at users.sourceforge.net
Tue Jan 18 20:30:33 CET 2011


Revision: 55310
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55310&view=rev
Author:   bgk
Date:     2011-01-18 19:30:32 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst_stacks/myst.cpp

Modified: scummvm/trunk/engines/mohawk/myst_stacks/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_stacks/myst.cpp	2011-01-18 19:22:48 UTC (rev 55309)
+++ scummvm/trunk/engines/mohawk/myst_stacks/myst.cpp	2011-01-18 19:30:32 UTC (rev 55310)
@@ -3002,10 +3002,15 @@
 
 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list