[Scummvm-git-logs] scummvm master -> 501ed235e35a78ab1c0cef4204964b584d32f6da

[sev-]

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

Summary:
4d24ce5959 SAGA2: Remove unused variable
dd50ae1089 DIRECTOR: Improve debug output
501ed235e3 DIRECTOR: Return full path for Raw EXE


Commit: 4d24ce595964f3f1463d6daa8ff4cd280bd63a98
    https://github.com/scummvm/scummvm/commit/4d24ce595964f3f1463d6daa8ff4cd280bd63a98
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-02T12:04:23+02:00

Commit Message:
SAGA2: Remove unused variable

Changed paths:
    engines/saga2/beegee.cpp


diff --git a/engines/saga2/beegee.cpp b/engines/saga2/beegee.cpp
index 96bbd78773c..53779e06d46 100644
--- a/engines/saga2/beegee.cpp
+++ b/engines/saga2/beegee.cpp
@@ -213,7 +213,6 @@ void setAreaSound(const TilePoint &) {
 				regn.min = baseCoords - ((AudVec * r) << kPlatShift); ///kTileUVSize;
 				MetaTileIterator    mIter(g_vm->_currentMapNum, regn);
 				int i = 0;
-				int j = 0;
 
 				TilePoint       dist = AudVec * r << (kPlatShift + 1);
 				dist = dist << 4;
@@ -223,7 +222,6 @@ void setAreaSound(const TilePoint &) {
 				while (mt) {
 					i++;
 					if (getSound(mt)) {
-						j++;
 						TilePoint thisDist = mtPos - baseCoords;
 						if (thisDist.magnitude() < dist.magnitude()) {
 							dist = thisDist;


Commit: dd50ae1089eb776f9b8d31ce9a9d8091a3523701
    https://github.com/scummvm/scummvm/commit/dd50ae1089eb776f9b8d31ce9a9d8091a3523701
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-02T14:36:41+02:00

Commit Message:
DIRECTOR: Improve debug output

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 3c664271942..ae87af48b10 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -50,10 +50,11 @@ Archive *DirectorEngine::createArchive() {
 }
 
 Common::Error Window::loadInitialMovie() {
+	Common::String movie = (_vm->getGameGID() == GID_TESTALL) ? getNextMovieFromQueue().movie : _vm->getEXEName();
+
 	debug(0, "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
-	debug(0, "@@@@   Loading initial movie");
+	debug(0, "@@@@   Loading initial movie '%s'", movie.c_str());
 	debug(0, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
-	Common::String movie = (_vm->getGameGID() == GID_TESTALL) ? getNextMovieFromQueue().movie : _vm->getEXEName();
 
 	if (movie.empty())
 		return Common::kPathNotFile;
@@ -74,7 +75,7 @@ Common::Error Window::loadInitialMovie() {
 	} else {
 		delete multiArchive;
 	}
-	
+
 	_currentMovie = new Movie(this);
 	_currentPath = getPath(movie, _currentPath);
 	Common::String sharedCastPath = getSharedCastPath();


Commit: 501ed235e35a78ab1c0cef4204964b584d32f6da
    https://github.com/scummvm/scummvm/commit/501ed235e35a78ab1c0cef4204964b584d32f6da
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-02T16:31:29+02:00

Commit Message:
DIRECTOR: Return full path for Raw EXE

This fixed mcluhan-win that uses path to .exe as the root for other files

Changed paths:
    engines/director/director.cpp
    engines/director/resource.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index b63f54a5089..de2e4d158e4 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -292,7 +292,7 @@ Common::CodePage DirectorEngine::getPlatformEncoding() {
 
 Common::String DirectorEngine::getRawEXEName() const {
 	// Returns raw executable name (without getting overloaded from --start-movie option)
-	return Common::punycode_decodefilename(Common::lastPathComponent(_gameDescription->desc.filesDescriptions[0].fileName, '/'));
+	return Common::Path(_gameDescription->desc.filesDescriptions[0].fileName).toString(g_director->_dirSeparator);
 }
 
 Common::String DirectorEngine::getEXEName() const {
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index ae87af48b10..935a02364f7 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -252,9 +252,10 @@ void Window::loadINIStream() {
 }
 
 Archive *Window::loadEXE(const Common::String movie) {
-	Common::SeekableReadStream *exeStream = SearchMan.createReadStreamForMember(Common::Path(movie, g_director->_dirSeparator));
+	Common::Path path(movie, g_director->_dirSeparator);
+	Common::SeekableReadStream *exeStream = SearchMan.createReadStreamForMember(path);
 	if (!exeStream) {
-		warning("Window::loadEXE(): Failed to open EXE '%s'", g_director->getEXEName().c_str());
+		warning("Window::loadEXE(): Failed 1 to open EXE '%s'", g_director->getEXEName().c_str());
 		return nullptr;
 	}
 
@@ -273,9 +274,9 @@ Archive *Window::loadEXE(const Common::String movie) {
 			return nullptr;
 		}
 	} else {
-		Common::WinResources *exe = Common::WinResources::createFromEXE(movie);
+		Common::WinResources *exe = Common::WinResources::createFromEXE(path.toString());
 		if (!exe) {
-			warning("Window::loadEXE(): Failed to open EXE '%s'", g_director->getEXEName().c_str());
+			warning("Window::loadEXE(): Failed 2 to open EXE '%s'", g_director->getEXEName().c_str());
 			delete exeStream;
 			return nullptr;
 		}