[Scummvm-git-logs] scummvm master -> 871b39c34701c7219aee83e0eaf3e111849f7285

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
871b39c347 DIRECTOR: Do not enforce current path when loading next movie. Bug #13204


Commit: 871b39c34701c7219aee83e0eaf3e111849f7285
    https://github.com/scummvm/scummvm/commit/871b39c34701c7219aee83e0eaf3e111849f7285
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-23T01:03:56+01:00

Commit Message:
DIRECTOR: Do not enforce current path when loading next movie. Bug #13204

These days we are checking path validity in Window::setNextMovie(),
thus, forcing _currentPath leaded to inability to load movies from
root when called from within a subdirectory.

Fixes alice-win

Changed paths:
    engines/director/window.cpp


diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index f380e3e4e39..5345bb9cdde 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -315,7 +315,7 @@ void Window::loadNewSharedCast(Cast *previousSharedCast) {
 bool Window::loadNextMovie() {
 	_soundManager->changingMovie();
 	_newMovieStarted = true;
-	_currentPath = getPath(_nextMovie.movie, _currentPath);
+	_currentPath = Common::firstPathComponents(_nextMovie.movie, g_director->_dirSeparator);
 
 	Cast *previousSharedCast = nullptr;
 	if (_currentMovie) {