[Scummvm-cvs-logs] SF.net SVN: scummvm: [23302] scummvm/branches/branch-0-9-0/engines/scumm/he
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sun Jun 25 02:59:07 CEST 2006
Revision: 23302
Author: kirben
Date: 2006-06-24 17:59:01 -0700 (Sat, 24 Jun 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23302&view=rev
Log Message:
-----------
Convert file path, before playing videos in HE games
Modified Paths:
--------------
scummvm/branches/branch-0-9-0/engines/scumm/he/script_v100he.cpp
scummvm/branches/branch-0-9-0/engines/scumm/he/script_v90he.cpp
Modified: scummvm/branches/branch-0-9-0/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/he/script_v100he.cpp 2006-06-25 00:47:03 UTC (rev 23301)
+++ scummvm/branches/branch-0-9-0/engines/scumm/he/script_v100he.cpp 2006-06-25 00:59:01 UTC (rev 23302)
@@ -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/branches/branch-0-9-0/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/he/script_v90he.cpp 2006-06-25 00:47:03 UTC (rev 23301)
+++ scummvm/branches/branch-0-9-0/engines/scumm/he/script_v90he.cpp 2006-06-25 00:59:01 UTC (rev 23302)
@@ -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