[Scummvm-git-logs] scummvm master -> 96c36bb004e9b278ba26248f1fd23996f21ea1d5

[sev-]

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:
7dff783c74 DIRECTOR: Skip more unused chunks
96c36bb004 DIRECTOR: Remove VWtc/VWtk warnings. These chunks are not used


Commit: 7dff783c74c2477a3e578acc7353f5969a050b9e
    https://github.com/scummvm/scummvm/commit/7dff783c74c2477a3e578acc7353f5969a050b9e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-12T15:49:44+02:00

Commit Message:
DIRECTOR: Skip more unused chunks

Changed paths:
    engines/director/archive.cpp


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 19aeb90b6b8..5fe4f53b098 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -90,8 +90,21 @@ void Archive::listUnaccessedChunks() {
 			}
 		}
 
-		if (!accessed && type._key != MKTAG('f','r','e','e') && type._key != MKTAG('j','u','n','k'))
-			s += Common::String::format("%s: %d items\n", tag2str(type._key), type._value.size());
+		if (!accessed) {
+			switch (type._key) {
+			case MKTAG('f','r','e','e'):	// Freed chunk
+			case MKTAG('j','u','n','k'):	// Some unreferenced junk
+			case MKTAG('T','H','U','M'):	// Cast thumbnail - authoring only
+			case MKTAG('T','h','u','m'):	// Cast thumbnail - authoring only (D7+)
+			case MKTAG('F','C','O','L'):	// Favorite colors - authoring only
+			case MKTAG('S','C','R','F'):	// Shared Cast refs - authoring only
+			case MKTAG('V','W','t','c'):	// Score time code
+			case MKTAG('V','W','t','k'):	// Tape Key resource. Used as a lookup for labels in early Directors
+				break;
+			default:
+				s += Common::String::format("%s: %d items\n", tag2str(type._key), type._value.size());
+			}
+		}
 	}
 
 	if (!s.empty())


Commit: 96c36bb004e9b278ba26248f1fd23996f21ea1d5
    https://github.com/scummvm/scummvm/commit/96c36bb004e9b278ba26248f1fd23996f21ea1d5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-12T15:49:45+02:00

Commit Message:
DIRECTOR: Remove VWtc/VWtk warnings. These chunks are not used

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 9bb9a5192f7..54706b44c2f 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -526,17 +526,6 @@ void Cast::loadCast() {
 		delete r;
 	}
 
-	// Time code
-	// TODO: Is this a score resource?
-	if (_castArchive->hasResource(MKTAG('V', 'W', 't', 'c'), -1)) {
-		debug("STUB: Unhandled VWtc resource");
-	}
-
-	// Tape Key resource. Used as a lookup for labels in early Directors, later dropped
-	if (_castArchive->hasResource(MKTAG('V', 'W', 't', 'k'), -1)) {
-		debugC(4, kDebugLoading, "VWtk resource skipped");
-	}
-
 	// External sound files
 	if ((r = _castArchive->getMovieResourceIfPresent(MKTAG('S', 'T', 'R', ' '))) != nullptr) {
 		loadExternalSound(*r);