diff options
| author | clone2727 | 2014-01-17 15:59:44 -0800 |
|---|---|---|
| committer | clone2727 | 2014-01-17 15:59:44 -0800 |
| commit | 9d9ced07348e7b488933b58a0c76b3045d098a17 (patch) | |
| tree | a8f9a94d6b5252acd7f45ac38e5f41cb100906fb /engines/scumm/he/script_v100he.cpp | |
| parent | c87074f8a843fcbc52d8824666ec9d26603a017a (diff) | |
| parent | 3bfd42220533a3f2cd19e8f8a726ecc48ee97625 (diff) | |
| download | scummvm-rg350-9d9ced07348e7b488933b58a0c76b3045d098a17.tar.gz scummvm-rg350-9d9ced07348e7b488933b58a0c76b3045d098a17.tar.bz2 scummvm-rg350-9d9ced07348e7b488933b58a0c76b3045d098a17.zip | |
Merge pull request #366 from clone2727/he-saves-target-name
RFC: Make HE games use the target name in all save files
Diffstat (limited to 'engines/scumm/he/script_v100he.cpp')
| -rw-r--r-- | engines/scumm/he/script_v100he.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index 987f74957c..c26e3f57ea 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 |