[Scummvm-cvs-logs] SF.net SVN: scummvm: [23263] scummvm/trunk/engines/scumm/he

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sat Jun 24 01:10:30 CEST 2006


Revision: 23263
Author:   kirben
Date:     2006-06-23 16:10:23 -0700 (Fri, 23 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23263&view=rev

Log Message:
-----------
Convert file path, before playing videos in HE games

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/script_v100he.cpp
    scummvm/trunk/engines/scumm/he/script_v90he.cpp
Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp	2006-06-23 10:07:45 UTC (rev 23262)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp	2006-06-23 23:10:23 UTC (rev 23263)
@@ -2247,12 +2247,13 @@
 			if (_videoParams.flags == 0)
 				_videoParams.flags = 4;
 
+			const char *filename = (char *)_videoParams.filename + convertFilePath(_videoParams.filename);
 			if (_videoParams.flags == 2) {
-				// result = startVideo(_videoParams.filename, _videoParams.flags, _videoParams.wizResNum);
-				// VAR(119) = result;
+				// VAR(119) = startVideo(_videoParams.filename, _videoParams.flags, _videoParams.wizResNum);
+				VAR(119) = -1;
 			} else {
-				// result = startVideo(_videoParams.filename, _videoParams.flags);
-				// VAR(119) = result;
+				// VAR(119) = startVideo(_videoParams.filename, _videoParams.flags);
+				VAR(119) = -1;
 			}
 		} else if (_videoParams.status == 19) {
 			// Stop video

Modified: scummvm/trunk/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v90he.cpp	2006-06-23 10:07:45 UTC (rev 23262)
+++ scummvm/trunk/engines/scumm/he/script_v90he.cpp	2006-06-23 23:10:23 UTC (rev 23263)
@@ -542,12 +542,11 @@
 			if (_videoParams.flags == 0)
 				_videoParams.flags = 4;
 
+			const char *filename = (char *)_videoParams.filename + convertFilePath(_videoParams.filename);
 			if (_videoParams.flags & 2) {
-				int result = _moviePlay->load((const char *)_videoParams.filename, _videoParams.flags, _videoParams.wizResNum);
-				VAR(119) = result;
+				VAR(119) = _moviePlay->load(filename, _videoParams.flags, _videoParams.wizResNum);
 			} else {
-				int result = _moviePlay->load((const char *)_videoParams.filename, _videoParams.flags);
-				VAR(119) = result;
+				VAR(119) = _moviePlay->load(filename, _videoParams.flags);
 			}
 		} else if (_videoParams.status == 165) {
 			// Stop video


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