aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he/script_v100he.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2013-07-15 22:52:03 -0400
committerMatthew Hoops2013-10-05 15:45:36 -0400
commit3bfd42220533a3f2cd19e8f8a726ecc48ee97625 (patch)
treeabf18fc030d69183fe98a854b77bcac386bcac01 /engines/scumm/he/script_v100he.cpp
parent3f65a02ced741979ede333539bac67ead9dbc368 (diff)
downloadscummvm-rg350-3bfd42220533a3f2cd19e8f8a726ecc48ee97625.tar.gz
scummvm-rg350-3bfd42220533a3f2cd19e8f8a726ecc48ee97625.tar.bz2
scummvm-rg350-3bfd42220533a3f2cd19e8f8a726ecc48ee97625.zip
SCUMM: Make all HE saves prepend the target name
This makes HE follow the ScummVM convention of using the target name everywhere. It also fixes having more than one team in both soccer and football. Loading old saves will still work and they will be tried if the newer save names are not found.
Diffstat (limited to 'engines/scumm/he/script_v100he.cpp')
-rw-r--r--engines/scumm/he/script_v100he.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index b024154c7f..6d030bb125 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -1642,7 +1642,7 @@ void ScummEngine_v100he::o100_roomOps() {
copyScriptString((byte *)buffer, sizeof(buffer));
- _saveLoadFileName = (char *)buffer + convertFilePath(buffer, sizeof(buffer));
+ _saveLoadFileName = (char *)buffer;
debug(1, "o100_roomOps: case 137: filename %s", _saveLoadFileName.c_str());
_saveLoadFlag = pop();
@@ -2263,11 +2263,10 @@ void ScummEngine_v100he::o100_videoOps() {
if (_videoParams.flags == 0)
_videoParams.flags = 4;
- const char *filename = (char *)_videoParams.filename + convertFilePath(_videoParams.filename, sizeof(_videoParams.filename));
if (_videoParams.flags == 2) {
- VAR(119) = _moviePlay->load(filename, _videoParams.flags, _videoParams.wizResNum);
+ VAR(119) = _moviePlay->load(convertFilePath(_videoParams.filename), _videoParams.flags, _videoParams.wizResNum);
} else {
- VAR(119) = _moviePlay->load(filename, _videoParams.flags);
+ VAR(119) = _moviePlay->load(convertFilePath(_videoParams.filename), _videoParams.flags);
}
} else if (_videoParams.status == 19) {
// Stop video