[Scummvm-git-logs] scummvm master -> 2741b2ea710e54a2d7269914a34a520145c380e9

[mduggan]

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:
2741b2ea71 TETRAEDGE: Fix build for plugin builds


Commit: 2741b2ea710e54a2d7269914a34a520145c380e9
    https://github.com/scummvm/scummvm/commit/2741b2ea710e54a2d7269914a34a520145c380e9
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-03-13T18:59:42+09:00

Commit Message:
TETRAEDGE: Fix build for plugin builds

Changed paths:
    engines/tetraedge/detection.cpp
    engines/tetraedge/metaengine.cpp
    engines/tetraedge/metaengine.h


diff --git a/engines/tetraedge/detection.cpp b/engines/tetraedge/detection.cpp
index dc84cff8b08..3f71c8d35e0 100644
--- a/engines/tetraedge/detection.cpp
+++ b/engines/tetraedge/detection.cpp
@@ -37,6 +37,18 @@ TetraedgeMetaEngineDetection::TetraedgeMetaEngineDetection() : AdvancedMetaEngin
 	_flags = kADFlagMatchFullPaths;
 }
 
+static const Common::Language *getGameLanguages() {
+	static Common::Language languages[] = {
+		Common::EN_ANY,
+		Common::FR_FRA,
+		Common::DE_DEU,
+		Common::IT_ITA,
+		Common::ES_ESP,
+		Common::RU_RUS,
+		Common::UNK_LANG
+	};
+	return languages;
+}
 
 DetectedGame TetraedgeMetaEngineDetection::toDetectedGame(const ADDetectedGame &adGame, ADDetectedGameExtraInfo *extraInfo) const {
 	DetectedGame game = AdvancedMetaEngineDetection::toDetectedGame(adGame);
@@ -44,7 +56,7 @@ DetectedGame TetraedgeMetaEngineDetection::toDetectedGame(const ADDetectedGame &
 	// The AdvancedDetector model only allows specifying a single supported
 	// game language. Both games support multiple languages
 	if (game.gameId == "syberia" || game.gameId == "syberia2") {
-		const Common::Language *language = TetraedgeMetaEngine::getGameLanguages();
+		const Common::Language *language = getGameLanguages();
 		while (*language != Common::UNK_LANG) {
 			// "ru" only present on syberia 1
 			if (game.gameId == "syberia2" && *language == Common::RU_RUS)
diff --git a/engines/tetraedge/metaengine.cpp b/engines/tetraedge/metaengine.cpp
index 7da1056f34a..eea67eb4513 100644
--- a/engines/tetraedge/metaengine.cpp
+++ b/engines/tetraedge/metaengine.cpp
@@ -65,20 +65,6 @@ bool TetraedgeMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSupportsLoadingDuringStartup);
 }
 
-/*static*/
-const Common::Language *TetraedgeMetaEngine::getGameLanguages() {
-	static Common::Language languages[] = {
-		Common::EN_ANY,
-		Common::FR_FRA,
-		Common::DE_DEU,
-		Common::IT_ITA,
-		Common::ES_ESP,
-		Common::RU_RUS,
-		Common::UNK_LANG
-	};
-	return languages;
-}
-
 void TetraedgeMetaEngine::getSavegameThumbnail(Graphics::Surface &thumb) {
 	Tetraedge::TetraedgeEngine::getSavegameThumbnail(thumb);
 }
diff --git a/engines/tetraedge/metaengine.h b/engines/tetraedge/metaengine.h
index 8ebb6556d80..b5bc8ef9d07 100644
--- a/engines/tetraedge/metaengine.h
+++ b/engines/tetraedge/metaengine.h
@@ -44,8 +44,6 @@ public:
 	 */
 	bool hasFeature(MetaEngineFeature f) const override;
 
-	static const Common::Language *getGameLanguages();
-
 };
 
 #endif