[Scummvm-git-logs] scummvm master -> 1c63d9b9581ec9cb307d98ed44e352df9050d4d1

[dreammaster]

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:
1c63d9b958 TINSEL: Fix Japanese DW1 using Japanese.smp/idx/txt


Commit: 1c63d9b9581ec9cb307d98ed44e352df9050d4d1
    https://github.com/scummvm/scummvm/commit/1c63d9b9581ec9cb307d98ed44e352df9050d4d1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-10T19:07:52-07:00

Commit Message:
TINSEL: Fix Japanese DW1 using Japanese.smp/idx/txt

Changed paths:
    engines/tinsel/detection_tables.h
    engines/tinsel/tinsel.cpp


diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h
index 636026ac89..c623d1f0af 100644
--- a/engines/tinsel/detection_tables.h
+++ b/engines/tinsel/detection_tables.h
@@ -384,12 +384,12 @@ static const TinselGameDescription gameDescriptions[] = {
 			"CD",
 			{
 				{"dw.scn", 0, "70955425870c7720d6eebed903b2ef41", 776188},
-				{"english.smp", 0, NULL, -1},
+				{"japanese.smp", 0, NULL, -1},
 				AD_LISTEND
 			},
-			Common::EN_ANY,
+			Common::JA_JPN,
 			Common::kPlatformDOS,
-			ADGF_CD,
+			ADGF_CD | ADGF_UNSTABLE,
 			GUIO0()
 		},
 		GID_DW1,
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index e98d01c3a1..a43688f485 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -786,7 +786,7 @@ const char *const TinselEngine::_sampleIndices[][3] = {
 	{ "english.idx", "english1.idx", "english2.idx" },	// Spanish
 	{ "english.idx", "english1.idx", "english2.idx" },	// Hebrew (FIXME: not sure if this is correct)
 	{ "english.idx", "english1.idx", "english2.idx" },	// Hungarian (FIXME: not sure if this is correct)
-	{ "english.idx", "english1.idx", "english2.idx" },	// Japanese (FIXME: not sure if this is correct)
+	{ "japanese.idx", "japanese1.idx", "japanese2.idx" },	// Japanese
 	{ "us.idx", "us1.idx", "us2.idx" }					// US English
 };
 const char *const TinselEngine::_sampleFiles[][3] = {
@@ -797,7 +797,7 @@ const char *const TinselEngine::_sampleFiles[][3] = {
 	{ "english.smp", "english1.smp", "english2.smp" },	// Spanish
 	{ "english.smp", "english1.smp", "english2.smp" },	// Hebrew (FIXME: not sure if this is correct)
 	{ "english.smp", "english1.smp", "english2.smp" },	// Hungarian (FIXME: not sure if this is correct)
-	{ "english.smp", "english1.smp", "english2.smp" },	// Japanese (FIXME: not sure if this is correct)
+	{ "japanese.smp", "japanese1.smp", "japanese2.smp" },	// Japanese
 	{ "us.smp", "us1.smp", "us2.smp" },					// US English
 };
 const char *const TinselEngine::_textFiles[][3] = {
@@ -808,7 +808,7 @@ const char *const TinselEngine::_textFiles[][3] = {
 	{ "spanish.txt", "spanish1.txt", "spanish2.txt" },	// Spanish
 	{ "english.txt", "english1.txt", "english2.txt" },	// Hebrew (FIXME: not sure if this is correct)
 	{ "english.txt", "english1.txt", "english2.txt" },	// Hungarian (FIXME: not sure if this is correct)
-	{ "english.txt", "english1.txt", "english2.txt" },	// Japanese (FIXME: not sure if this is correct)
+	{ "japanese.txt", "japanese1.txt", "japanese2.txt" },	// Japanese
 	{ "us.txt", "us1.txt", "us2.txt" }					// US English
 };
 
@@ -1229,7 +1229,8 @@ const char *TinselEngine::getSampleIndex(LANGUAGE lang) {
 
 	} else {
 		cd = 0;
-		lang = TXT_ENGLISH;
+		if (lang != TXT_JAPANESE)
+			lang = TXT_ENGLISH;
 	}
 
 	return _sampleIndices[lang][cd];
@@ -1249,7 +1250,8 @@ const char *TinselEngine::getSampleFile(LANGUAGE lang) {
 
 	} else {
 		cd = 0;
-		lang = TXT_ENGLISH;
+		if (lang != TXT_JAPANESE)
+			lang = TXT_ENGLISH;
 	}
 
 	return _sampleFiles[lang][cd];