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

[thebluegr at users.sourceforge.net]

Revision: 49913
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49913&view=rev
Author:   thebluegr
Date:     2010-06-17 00:07:03 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
Added handling of VMD video files in kResCheck, fixes video playing in GK2

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kscripts.cpp
    scummvm/trunk/engines/sci/resource.h
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/engine/kscripts.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-06-16 23:30:22 UTC (rev 49912)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-06-17 00:07:03 UTC (rev 49913)
@@ -29,6 +29,8 @@
 #include "sci/engine/selector.h"
 #include "sci/engine/kernel.h"
 
+#include "common/file.h"
+
 namespace Sci {
 
 // Loads arbitrary resources of type 'restype' with resource numbers 'resnrs'
@@ -93,6 +95,12 @@
 	Resource *res = NULL;
 	ResourceType restype = (ResourceType)(argv[0].toUint16() & 0x7f);
 
+	if (restype == kResourceTypeVMD) {
+		char fileName[50];
+		sprintf(fileName, "%d.vmd", argv[1].toUint16());
+		return make_reg(0, Common::File::exists(fileName));
+	}
+
 	if ((restype == kResourceTypeAudio36) || (restype == kResourceTypeSync36)) {
 		if (argc >= 6) {
 			uint noun = argv[2].toUint16() & 0xff;

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-06-16 23:30:22 UTC (rev 49912)
+++ scummvm/trunk/engines/sci/resource.h	2010-06-17 00:07:03 UTC (rev 49913)
@@ -98,6 +98,7 @@
 	kResourceTypeUnknown1, // Translation, currently unsupported
 	kResourceTypeUnknown2,
 	kResourceTypeRobot,
+	kResourceTypeVMD,
 	kResourceTypeInvalid,
 
 	// Mac-only resources, these resource types are self-defined

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-06-16 23:30:22 UTC (rev 49912)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-06-17 00:07:03 UTC (rev 49913)
@@ -123,6 +123,7 @@
 	SearchMan.addSubDirectoryMatching(gameDataDir, "avi");	// AVI movie files for Windows versions
 	SearchMan.addSubDirectoryMatching(gameDataDir, "seq");	// SEQ movie files for DOS versions
 	SearchMan.addSubDirectoryMatching(gameDataDir, "robot");	// robot movie files
+	SearchMan.addSubDirectoryMatching(gameDataDir, "movies");	// vmd movie files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "vmd");	// vmd movie files
 
 	// Add the patches directory, except for KQ6CD; The patches folder in some versions of KQ6CD


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