[Scummvm-git-logs] scummvm master -> b8bff29967777e4af152afcb7065ae80e47599a0

[lephilousophe]

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:
b8bff29967 DIRECTOR: Revert use of detection code


Commit: b8bff29967777e4af152afcb7065ae80e47599a0
    https://github.com/scummvm/scummvm/commit/b8bff29967777e4af152afcb7065ae80e47599a0
Author: Scott Percival (code at moral.net.au)
Date: 2022-09-13T23:19:00+02:00

Commit Message:
DIRECTOR: Revert use of detection code

Changed paths:
    engines/director/debugger.cpp
    engines/director/detection.cpp
    engines/director/detection.h


diff --git a/engines/director/debugger.cpp b/engines/director/debugger.cpp
index ca6fc4dc564..4be61ea778d 100644
--- a/engines/director/debugger.cpp
+++ b/engines/director/debugger.cpp
@@ -20,13 +20,12 @@
  */
 
 #include "common/language.h"
-#include "director/detection.h"
 #include "director/director.h"
+#include "director/debugger.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-code.h"
 #include "director/lingo/lingo-object.h"
 #include "director/lingo/lingo-codegen.h"
-#include "director/debugger.h"
 
 namespace Director {
 
@@ -110,7 +109,6 @@ bool Debugger::cmdVersion(int argc, const char **argv) {
 	debugPrintf("Director version: %d\n", g_director->getVersion());
 	debugPrintf("Director platform: %s\n", Common::getPlatformCode(g_director->getPlatform()));
 	debugPrintf("Game ID: %s\n", g_director->getGameId());
-	debugPrintf("Game name: %s\n", getDescriptionFromGameId(g_director->getGameId()));
 	debugPrintf("Game variant: %s\n", g_director->getExtra());
 	debugPrintf("Language: %s\n", Common::getLanguageCode(g_director->getLanguage()));
 	debugPrintf("Expected Director version: %d\n", g_director->getDescriptionVersion());
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 697e490e6aa..8eac0465b35 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -70,17 +70,6 @@ static const DebugChannelDef debugFlagList[] = {
 	DEBUG_CHANNEL_END
 };
 
-namespace Director {
-
-const char *getDescriptionFromGameId(const char *gameId) {
-	const PlainGameDescriptor *g = findPlainGameDescriptor(gameId, directorGames);
-	if (!g)
-		return nullptr;
-	return g->description;
-}
-
-} // End of namespace Director
-
 class DirectorMetaEngineDetection : public AdvancedMetaEngineDetection {
 private:
 	Common::HashMap<Common::String, bool, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _customTarget;
diff --git a/engines/director/detection.h b/engines/director/detection.h
index 1b558964ee2..99b67cc6bb3 100644
--- a/engines/director/detection.h
+++ b/engines/director/detection.h
@@ -41,8 +41,6 @@ struct DirectorGameDescription {
 
 extern const char *directoryGlobs[];
 
-const char *getDescriptionFromGameId(const char *gameId);
-
 } // End of namespace Director
 
 #endif // DIRECTOR_DETECTION_H