diff options
| author | Eugene Sandulenko | 2020-01-01 15:24:15 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2020-01-01 15:24:15 +0100 |
| commit | 724ced87d03dcafd45164e70ef14190023c4dec8 (patch) | |
| tree | aa7af196c4bd70c64c82510afcdfa4d8439213ef | |
| parent | ec56be281d65384edb643d10ab705a7cf6a2c858 (diff) | |
| download | scummvm-rg350-724ced87d03dcafd45164e70ef14190023c4dec8.tar.gz scummvm-rg350-724ced87d03dcafd45164e70ef14190023c4dec8.tar.bz2 scummvm-rg350-724ced87d03dcafd45164e70ef14190023c4dec8.zip | |
DIRECTOR: Improve path converting
| -rw-r--r-- | engines/director/lingo/lingo-funcs.cpp | 4 | ||||
| -rw-r--r-- | engines/director/util.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp index 7263e54ae8..a68539bed0 100644 --- a/engines/director/lingo/lingo-funcs.cpp +++ b/engines/director/lingo/lingo-funcs.cpp @@ -212,8 +212,8 @@ 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()); + debug(1, "func_goto: '%s' -> '%s' -> '%s' -> '%s", movie.u.s->c_str(), convertPath(*movie.u.s).c_str(), + movieFilename.c_str(), cleanedFilename.c_str()); if (!fileExists) { warning("Movie %s does not exist", movieFilename.c_str()); diff --git a/engines/director/util.cpp b/engines/director/util.cpp index 9afc19171f..f3db3ff643 100644 --- a/engines/director/util.cpp +++ b/engines/director/util.cpp @@ -122,9 +122,9 @@ Common::String convertPath(Common::String &path) { Common::String res; uint32 idx = 0; - if (path.hasPrefix(":::")) { + if (path.hasPrefix("::")) { res = "../"; - idx = 3; + idx = 2; } else { res = "./"; idx = 1; |