[Scummvm-git-logs] scummvm master -> 4127d0a8feee7a2982aee6387f8f5a11cab9a557

[criezy]

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

Summary:
c4e7dde7ce AGS: Remove unused variable
4127d0a8fe AGS: Add some debug messages to ResolveScriptPath


Commit: c4e7dde7ce4a807a95f1725adf18a828eca8a721
    https://github.com/scummvm/scummvm/commit/c4e7dde7ce4a807a95f1725adf18a828eca8a721
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-30T21:44:00+01:00

Commit Message:
AGS: Remove unused variable

This is not present in the upstream code either. I guess this was
part of some intermediate changes we did, but is no longer needed.

Changed paths:
    engines/ags/engine/ac/file.cpp


diff --git a/engines/ags/engine/ac/file.cpp b/engines/ags/engine/ac/file.cpp
index 6b285ea3e4..93767af907 100644
--- a/engines/ags/engine/ac/file.cpp
+++ b/engines/ags/engine/ac/file.cpp
@@ -361,7 +361,6 @@ bool ResolveScriptPath(const String &orig_sc_path, bool read_only, ResolvedPath
 	}
 #endif
 
-	String full_path = String::FromFormat("%s%s", parent_dir.BaseDir.GetCStr(), child_path.GetCStr());
 	// don't allow write operations for relative paths outside game dir
 	ResolvedPath test_rp = ResolvedPath(parent_dir, child_path, alt_path);
 	if (!read_only) {


Commit: 4127d0a8feee7a2982aee6387f8f5a11cab9a557
    https://github.com/scummvm/scummvm/commit/4127d0a8feee7a2982aee6387f8f5a11cab9a557
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-30T21:44:00+01:00

Commit Message:
AGS: Add some debug messages to ResolveScriptPath

Changed paths:
    engines/ags/engine/ac/file.cpp


diff --git a/engines/ags/engine/ac/file.cpp b/engines/ags/engine/ac/file.cpp
index 93767af907..3fc6de3849 100644
--- a/engines/ags/engine/ac/file.cpp
+++ b/engines/ags/engine/ac/file.cpp
@@ -371,6 +371,9 @@ bool ResolveScriptPath(const String &orig_sc_path, bool read_only, ResolvedPath
 	}
 
 	rp = test_rp;
+	debugC(::AGS::kDebugFilePath, "Final path: %s", rp.FullPath.GetCStr());
+	if (!rp.AltPath.IsEmpty())
+		debugC(::AGS::kDebugFilePath, "Alt path: %s", rp.AltPath.GetCStr());
 	return true;
 }