[Scummvm-git-logs] scummvm master -> 9f1f955f2a96f740ad9af537bd366d9171c0153d

[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:
2760b9f737 AD: Allow punycode in the detection entries
9f1f955f2a DIRECTOR: Allow punycode in the detection entries


Commit: 2760b9f737d87b028eff0ee5722da47320cb48c3
    https://github.com/scummvm/scummvm/commit/2760b9f737d87b028eff0ee5722da47320cb48c3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-27T23:45:29+02:00

Commit Message:
AD: Allow punycode in the detection entries

Changed paths:
    engines/advancedDetector.cpp


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 257d611f0c..500a4c79df 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -26,6 +26,7 @@
 #include "common/macresman.h"
 #include "common/md5.h"
 #include "common/config-manager.h"
+#include "common/punycode.h"
 #include "common/system.h"
 #include "common/textconsole.h"
 #include "common/translation.h"
@@ -572,7 +573,7 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
 		g = (const ADGameDescription *)descPtr;
 
 		for (fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
-			Common::String fname = fileDesc->fileName;
+			Common::String fname = Common::punycode_decodefilename(fileDesc->fileName);
 
 			if (filesProps.contains(fname))
 				continue;
@@ -613,7 +614,7 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
 
 		// Try to match all files for this game
 		for (fileDesc = game.desc->filesDescriptions; fileDesc->fileName; fileDesc++) {
-			Common::String tstr = fileDesc->fileName;
+			Common::String tstr = Common::punycode_decodefilename(fileDesc->fileName);
 
 			if (!filesProps.contains(tstr) || filesProps[tstr].size == -1) {
 				allFilesPresent = false;


Commit: 9f1f955f2a96f740ad9af537bd366d9171c0153d
    https://github.com/scummvm/scummvm/commit/9f1f955f2a96f740ad9af537bd366d9171c0153d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-27T23:45:29+02:00

Commit Message:
DIRECTOR: Allow punycode in the detection entries

Changed paths:
    engines/director/metaengine.cpp


diff --git a/engines/director/metaengine.cpp b/engines/director/metaengine.cpp
index a30ae68226..35bbd85b98 100644
--- a/engines/director/metaengine.cpp
+++ b/engines/director/metaengine.cpp
@@ -62,7 +62,7 @@ Common::String DirectorEngine::getEXEName() const {
 	if (startMovie.startMovie.size() > 0)
 		return startMovie.startMovie;
 
-	return _gameDescription->desc.filesDescriptions[0].fileName;
+	return Common::punycode_decodefilename(_gameDescription->desc.filesDescriptions[0].fileName);
 }
 
 StartMovie DirectorEngine::getStartMovie() const {