aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2006-06-23 23:10:23 +0000
committerTravis Howell2006-06-23 23:10:23 +0000
commitdbfc1cb9b1945642d3ebea6db8884289ccd58ad7 (patch)
tree802ed9f2c10d196c1f9f69ddc4c7554d3e9c7ccf /engines/scumm
parentea36cacc7abf86c415f198f7e2c1e51fc94a6aa7 (diff)
downloadscummvm-rg350-dbfc1cb9b1945642d3ebea6db8884289ccd58ad7.tar.gz
scummvm-rg350-dbfc1cb9b1945642d3ebea6db8884289ccd58ad7.tar.bz2
scummvm-rg350-dbfc1cb9b1945642d3ebea6db8884289ccd58ad7.zip
Convert file path, before playing videos in HE games
svn-id: r23263
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/script_v100he.cpp9
-rw-r--r--engines/scumm/he/script_v90he.cpp7
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index b7191a90ec..2a76f62bbb 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -2247,12 +2247,13 @@ void ScummEngine_v100he::o100_videoOps() {
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
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index b911844f22..f18a049785 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -542,12 +542,11 @@ void ScummEngine_v90he::o90_videoOps() {
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