aboutsummaryrefslogtreecommitdiff
path: root/engines/director/director.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2020-01-01 15:15:27 +0100
committerEugene Sandulenko2020-01-01 15:15:27 +0100
commitec56be281d65384edb643d10ab705a7cf6a2c858 (patch)
tree544527b5f16718b09643aaec7d03c891bdab808d /engines/director/director.cpp
parent4526ba8fae5ccaa809a1bd64b0f9079c8864d948 (diff)
downloadscummvm-rg350-ec56be281d65384edb643d10ab705a7cf6a2c858.tar.gz
scummvm-rg350-ec56be281d65384edb643d10ab705a7cf6a2c858.tar.bz2
scummvm-rg350-ec56be281d65384edb643d10ab705a7cf6a2c858.zip
DIRECTOR: Use current path for navigating between movies
Diffstat (limited to 'engines/director/director.cpp')
-rw-r--r--engines/director/director.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 848553b4b8..779ca732a1 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -154,7 +154,7 @@ Common::Error DirectorEngine::run() {
//_mainArchive->openFile("bookshelf_example.mmm");
_currentScore = new Score(this);
- _currentPath = getPath(getEXEName());
+ _currentPath = getPath(getEXEName(), _currentPath);
if (getVersion() < 4) {
if (getPlatform() == Common::kPlatformWindows) {
@@ -210,11 +210,11 @@ Common::Error DirectorEngine::run() {
delete _currentScore;
- _currentPath = getPath(_nextMovie.movie);
+ _currentPath = getPath(_nextMovie.movie, _currentPath);
loadSharedCastsFrom(_currentPath + _sharedCastFile);
- Archive *mov = openMainArchive(_nextMovie.movie);
+ Archive *mov = openMainArchive(_currentPath + Common::lastPathComponent(_nextMovie.movie, '/'));
if (!mov) {
warning("nextMovie: No score is loaded");