diff options
| author | Eugene Sandulenko | 2020-01-01 15:15:27 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2020-01-01 15:15:27 +0100 |
| commit | ec56be281d65384edb643d10ab705a7cf6a2c858 (patch) | |
| tree | 544527b5f16718b09643aaec7d03c891bdab808d /engines/director/lingo/lingo-funcs.cpp | |
| parent | 4526ba8fae5ccaa809a1bd64b0f9079c8864d948 (diff) | |
| download | scummvm-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/lingo/lingo-funcs.cpp')
| -rw-r--r-- | engines/director/lingo/lingo-funcs.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp index fd0bd1a4c0..7263e54ae8 100644 --- a/engines/director/lingo/lingo-funcs.cpp +++ b/engines/director/lingo/lingo-funcs.cpp @@ -182,7 +182,7 @@ void Lingo::func_goto(Datum &frame, Datum &movie) { if (movie.type != VOID) { movie.toString(); - Common::String movieFilename = convertPath(*movie.u.s); + Common::String movieFilename = Common::normalizePath(g_director->getCurrentPath() + convertPath(*movie.u.s), '/'); Common::String cleanedFilename; bool fileExists = false; @@ -212,6 +212,9 @@ void Lingo::func_goto(Datum &frame, Datum &movie) { } } + debug(1, "func_goto: '%s' -> '%s' -> '%s", movie.u.s->c_str(), movieFilename.c_str(), + cleanedFilename.c_str()); + if (!fileExists) { warning("Movie %s does not exist", movieFilename.c_str()); return; |