[Scummvm-git-logs] scummvm master -> cc1b658c48329ca0cdfe42e16b8d8957b3049194

[sev-]

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:
cc1b658c48 MOHAWK: Support for the Riven JP CD structure


Commit: cc1b658c48329ca0cdfe42e16b8d8957b3049194
    https://github.com/scummvm/scummvm/commit/cc1b658c48329ca0cdfe42e16b8d8957b3049194
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-23T21:49:25+02:00

Commit Message:
MOHAWK: Support for the Riven JP CD structure

Changed paths:
    engines/mohawk/detection_tables.h
    engines/mohawk/riven.cpp



diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 606c9e3..9cc52a7 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -408,7 +408,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 
 
 	// Riven: The Sequel to Myst
-	// Version 1.? (5CD) - Japanese
+	// Version 1.0J (5CD) - Japanese
 	// From sev
 	{
 		{
@@ -416,7 +416,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			"",
 			AD_ENTRY1s("a_Data.MHK", "3a2b4764979dc007a0e6ded64e4b7889", 10014314),
 			Common::JA_JPN,
-			Common::kPlatformMacintosh,
+			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
 			GUIO1(GUIO_NOASPECT)
 		},
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index b7c83c0..a1eef85 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -82,6 +82,7 @@ MohawkEngine_Riven::MohawkEngine_Riven(OSystem *syst, const MohawkGameDescriptio
 	SearchMan.addSubDirectoryMatching(gameDataDir, "data");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "exe");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "assets1");
+	SearchMan.addSubDirectoryMatching(gameDataDir, "program");
 
 	g_atrusJournalRect1 = new Common::Rect(295, 402, 313, 426);
 	g_atrusJournalRect2 = new Common::Rect(259, 402, 278, 426);