[Scummvm-cvs-logs] SF.net SVN: scummvm:[51739] scummvm/trunk/engines/sci

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Wed Aug 4 17:17:10 CEST 2010


Revision: 51739
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51739&view=rev
Author:   mthreepwood
Date:     2010-08-04 15:17:09 +0000 (Wed, 04 Aug 2010)

Log Message:
-----------
SCI: Add 'movie' subdirectory for VMD's

The Torin's intro movie now plays. Minor kPlayVMD cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kvideo.cpp
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/engine/kvideo.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kvideo.cpp	2010-08-04 13:35:56 UTC (rev 51738)
+++ scummvm/trunk/engines/sci/engine/kvideo.cpp	2010-08-04 15:17:09 UTC (rev 51739)
@@ -205,11 +205,15 @@
 
 		videoDecoder = new VMDDecoder(g_system->getMixer());
 
+		if (!videoDecoder->loadFile(fileName)) {
+			warning("Could not open VMD %s", fileName.c_str());
+			break;
+		}
+
 		if (reshowCursor)
 			g_sci->_gfxCursor->kernelHide();
 
-		if (videoDecoder && videoDecoder->loadFile(fileName))
-			playVideo(videoDecoder);
+		playVideo(videoDecoder);
 
 		if (reshowCursor)
 			g_sci->_gfxCursor->kernelShow();
@@ -280,8 +284,7 @@
 		// Looks to be setting the video size and position. Called with 4 extra integer
 		// parameters (e.g. 86, 41, 235, 106)
 	default:
-		warningMsg = "PlayVMD - unsupported subop. Params: " +
-									Common::String::printf("%d", argc) + " (";
+		warningMsg = Common::String::printf("PlayVMD - unsupported subop %d. Params: %d (", operation, argc);
 
 		for (int i = 0; i < argc; i++) {
 			warningMsg +=  Common::String::printf("%04x:%04x", PRINT_REG(argv[i]));

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-08-04 13:35:56 UTC (rev 51738)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-08-04 15:17:09 UTC (rev 51739)
@@ -126,6 +126,7 @@
 	SearchMan.addSubDirectoryMatching(gameDataDir, "seq");	// SEQ movie files for DOS versions
 	SearchMan.addSubDirectoryMatching(gameDataDir, "robot");	// robot movie files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "robots");	// robot movie files
+	SearchMan.addSubDirectoryMatching(gameDataDir, "movie");	// vmd movie files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "movies");	// vmd movie files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "vmd");	// vmd movie files
 


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