[Scummvm-cvs-logs] SF.net SVN: scummvm:[49237] scummvm/trunk/engines/mohawk

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Wed May 26 15:11:04 CEST 2010


Revision: 49237
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49237&view=rev
Author:   mthreepwood
Date:     2010-05-26 13:11:04 +0000 (Wed, 26 May 2010)

Log Message:
-----------
Fix the 'boiling water' videos in the boiler puzzle.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/riven_external.cpp
    scummvm/trunk/engines/mohawk/riven_scripts.cpp
    scummvm/trunk/engines/mohawk/video.cpp

Modified: scummvm/trunk/engines/mohawk/riven_external.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/riven_external.cpp	2010-05-26 12:15:14 UTC (rev 49236)
+++ scummvm/trunk/engines/mohawk/riven_external.cpp	2010-05-26 13:11:04 UTC (rev 49237)
@@ -537,13 +537,14 @@
 	if (heat) {
 		if (platform == 0) {
 			_vm->_video->activateMLST(7, _vm->getCurCard());
-			// TODO: Play video (non-blocking)
+			_vm->_video->playMovie(7);
 		} else {
 			_vm->_video->activateMLST(8, _vm->getCurCard());
-			// TODO: Play video (non-blocking)
+			_vm->_video->playMovie(8);
 		}
 	} else {
-		// TODO: Stop MLST's 7 and 8
+		_vm->_video->stopMovie(7);
+		_vm->_video->stopMovie(8);
 	}
 
 	_vm->refreshCard();

Modified: scummvm/trunk/engines/mohawk/riven_scripts.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/riven_scripts.cpp	2010-05-26 12:15:14 UTC (rev 49236)
+++ scummvm/trunk/engines/mohawk/riven_scripts.cpp	2010-05-26 13:11:04 UTC (rev 49237)
@@ -547,9 +547,8 @@
 
 // Command 41: activate MLST record and play
 void RivenScript::activateMLSTAndPlay(uint16 op, uint16 argc, uint16 *argv) {
-	_vm->_video->enableMovie(argv[0] - 1);
 	_vm->_video->activateMLST(argv[0], _vm->getCurCard());
-	// TODO: Play movie (blocking?)
+	_vm->_video->playMovie(argv[0]);
 }
 
 // Command 43: activate BLST record (card hotspot enabling lists)

Modified: scummvm/trunk/engines/mohawk/video.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video.cpp	2010-05-26 12:15:14 UTC (rev 49236)
+++ scummvm/trunk/engines/mohawk/video.cpp	2010-05-26 13:11:04 UTC (rev 49237)
@@ -277,8 +277,10 @@
 		if (_mlstRecords[i].code == id)
 			for (uint16 j = 0; j < _videoStreams.size(); j++)
 				if (_mlstRecords[i].movieID == _videoStreams[j].id) {
-					delete _videoStreams[i].video;
-					memset(&_videoStreams[i].video, 0, sizeof(VideoEntry));
+					delete _videoStreams[j].video;
+					_videoStreams[j].video = 0;
+					_videoStreams[j].id = 0;
+					_videoStreams[j].filename.clear();
 					return;
 				}
 }


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