[Scummvm-git-logs] scummvm master -> 51789f8feaff4d64889fde82f8a2bbb78a5fae25

[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:
51789f8fea DIRECTOR: Show the unknown game dialog for fallback detection entries


Commit: 51789f8feaff4d64889fde82f8a2bbb78a5fae25
    https://github.com/scummvm/scummvm/commit/51789f8feaff4d64889fde82f8a2bbb78a5fae25
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-09-19T23:21:44+02:00

Commit Message:
DIRECTOR: Show the unknown game dialog for fallback detection entries

Changed paths:
    engines/director/detection.cpp


diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 4a00368789..6d9310291e 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -285,6 +285,7 @@ static Director::DirectorGameDescription s_fallbackDesc = {
 };
 
 static char s_fallbackFileNameBuffer[51];
+static char s_fallbackExtraBuf[256];
 
 ADDetectedGame DirectorMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
 	// TODO: Handle Mac fallback
@@ -374,9 +375,21 @@ ADDetectedGame DirectorMetaEngine::fallbackDetect(const FileMap &allFiles, const
 		s_fallbackFileNameBuffer[50] = '\0';
 		desc->desc.filesDescriptions[0].fileName = s_fallbackFileNameBuffer;
 
-		warning("Director fallback detection D%d", desc->version);
+		Common::String extra = Common::String::format("v%d.%02d", desc->version / 100, desc->version % 100);
+		Common::strlcpy(s_fallbackExtraBuf, extra.c_str(), sizeof(s_fallbackExtraBuf) - 1);
+		desc->desc.extra = s_fallbackExtraBuf;
 
-		return ADDetectedGame(&desc->desc);
+		warning("Director fallback detection %s", extra.c_str());
+
+		ADDetectedGame game(&desc->desc);
+
+		FileProperties tmp;
+		if (getFileProperties(file->getParent(), allFiles, desc->desc, file->getName(), tmp)) {
+			game.hasUnknownFiles = true;
+			game.matchedFiles[file->getName()] = tmp;
+		}
+
+		return game;
 	}
 
 	return ADDetectedGame();