[Scummvm-cvs-logs] scummvm master -> 2f1ae3fb4e31a5840334d3554becc156c075cb1d

[criezy]

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:
2f1ae3fb4e SWORD25: Fix error after changing language in-game with the data file distributed by ScummVM


Commit: 2f1ae3fb4e31a5840334d3554becc156c075cb1d
    https://github.com/scummvm/scummvm/commit/2f1ae3fb4e31a5840334d3554becc156c075cb1d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-03-09T00:38:08Z

Commit Message:
SWORD25: Fix error after changing language in-game with the data file distributed by ScummVM

Changing the language in-game causes the language to be set for the target in the
scummvm.ini file. Then the next time we try to start the engine, if was causing an error
(Sword25 failed to instantiate engine: Game data not found) because there was no match
for the path and language in the detection table. Setting the language to Unknown in
the detection table for this multilingual data file fixes the issue.

Changed paths:
    engines/sword25/detection_tables.h



diff --git a/engines/sword25/detection_tables.h b/engines/sword25/detection_tables.h
index fa79bde..927060b 100644
--- a/engines/sword25/detection_tables.h
+++ b/engines/sword25/detection_tables.h
@@ -132,11 +132,14 @@ static const ADGameDescription gameDescriptions[] = {
 
 	// Distributed by ScummVM
 	// Contains all language packs, English voice-overs and Hungarian version
+	// Mark it as Unknown Language since it contains multiple languages. If we
+	// mark it as English, then changing the language in-game causes the detection
+	// to fail the next time we try to start the engine.
 	{
 		"sword25",
 		"Latest version",
 		AD_ENTRY1s("data.b25c", "880a8a67faf4a4e7ab62cf114b771428", 827397764),
-		Common::EN_ANY,
+		Common::UNK_LANG,
 		Common::kPlatformUnknown,
 		ADGF_NO_FLAGS,
 		GUIO1(GUIO_NOASPECT)