[Scummvm-git-logs] scummvm master -> 6b97f562d42f457f3791e298aea210179e2297bb

[phcoder]

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:
6b97f562d4 NEVERHOOD: Remove the check for subtitle presence


Commit: 6b97f562d42f457f3791e298aea210179e2297bb
    https://github.com/scummvm/scummvm/commit/6b97f562d42f457f3791e298aea210179e2297bb
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-03-02T19:11:42+01:00

Commit Message:
NEVERHOOD: Remove the check for subtitle presence

Originally intended for the case when subtitles could only be put
in $game/language. Other places like $extra_path are not taken into
account properly. Even worse it gets very hairy when extra_path is
changed. This is used only to disable subtitle setting, so just always
make subtitle buttons available.

Changed paths:
    engines/neverhood/detection.cpp


diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 9b32335f11b..b7dd801064e 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -137,35 +137,6 @@ public:
 				    GAMEOPTION_SCALE_MAKING_OF_VIDEOS, GAMEOPTION_REPEAT_WILLIE_HINT);
 	}
 
-	DetectedGames detectGames(const Common::FSList &fslist, uint32 skipADFlags, bool skipIncomplete) override {
-		DetectedGames detGames(AdvancedMetaEngineDetection::detectGames(fslist, skipADFlags, skipIncomplete));
-		bool hasSubs = false;
-
-		if (detGames.empty())
-			return detGames;
-
-		for (Common::FSList::const_iterator dr = fslist.begin(); dr != fslist.end() && !hasSubs; dr++) {
-			if (dr->getName().equalsIgnoreCase("language") && dr->isDirectory()) {
-				Common::FSList files;
-				if (!dr->getChildren(files, Common::FSNode::kListAll))
-					continue;
-				for (Common::FSList::const_iterator file = files.begin(); file != files.end(); file++) {
-					Common::String fname = file->getName();
-					if (fname.matchString("*.nhc", true) && !fname.equalsIgnoreCase("Fargusfx.nhc")) {
-						hasSubs = true;
-						break;
-					}
-				}
-			}
-		}
-		if (hasSubs)
-			return detGames;
-		for (DetectedGames::iterator it = detGames.begin(); it != detGames.end(); it++) {
-			it->appendGUIOptions("sndNoSubs");
-		}
-		return detGames;
-	}
-
 	const char *getName() const override {
 		return "neverhood";
 	}