[Scummvm-cvs-logs] SF.net SVN: scummvm:[39963] scummvm/branches/branch-0-13-0/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 39963
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39963&view=rev
Author:   lordhoto
Date:     2009-04-16 12:39:54 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
Backport of Kyra1 Mac CD support (r39955 + r39962).

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/kyra/detection.cpp
    scummvm/branches/branch-0-13-0/engines/kyra/staticres.cpp

Modified: scummvm/branches/branch-0-13-0/engines/kyra/detection.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/detection.cpp	2009-04-16 12:31:17 UTC (rev 39962)
+++ scummvm/branches/branch-0-13-0/engines/kyra/detection.cpp	2009-04-16 12:39:54 UTC (rev 39963)
@@ -326,9 +326,55 @@
 		KYRA1_CD_FLAGS
 	},
 
+	{ // Kyra 1 Mac CD as mentioned in fr #2766454 "KYRA1: Add support for Macintosh CD" by nnooiissee
+		{
+			"kyra1",
+			"CD",
+			{
+				{ "GEMCUT.PAK", 0, "d3d4b281cd357230aabcec46843d04bd", -1 },
+				{ "BEAD.CPS", 0, "3038466f65b7751451844707187aa401", -1 },
+				{ NULL, 0, NULL, 0 }
+			},
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_CD
+		},
+		KYRA1_CD_FLAGS
+	},
 	{
 		{
 			"kyra1",
+			"CD",
+			{
+				{ "GEMCUT.PAK", 0, "4a0cb720e824295bcbccbd1407652110", -1 },
+				{ "BEAD.CPS", 0, "3038466f65b7751451844707187aa401", -1 },
+				{ NULL, 0, NULL, 0 }
+			},
+			Common::DE_DEU,
+			Common::kPlatformMacintosh,
+			ADGF_CD
+		},
+		KYRA1_CD_FLAGS
+	},
+	{
+		{
+			"kyra1",
+			"CD",
+			{
+				{ "GEMCUT.PAK", 0, "b71ee090aa12e80ed2ba068826d92bed", -1 },
+				{ "BEAD.CPS", 0, "3038466f65b7751451844707187aa401", -1 },
+				{ NULL, 0, NULL, 0 }
+			},
+			Common::FR_FRA,
+			Common::kPlatformMacintosh,
+			ADGF_CD
+		},
+		KYRA1_CD_FLAGS
+	},
+
+	{
+		{
+			"kyra1",
 			"Demo",
 			AD_ENTRY1("DEMO1.WSA", "fb722947d94897512b13b50cc84fd648"),
 			Common::EN_ANY,

Modified: scummvm/branches/branch-0-13-0/engines/kyra/staticres.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/staticres.cpp	2009-04-16 12:31:17 UTC (rev 39962)
+++ scummvm/branches/branch-0-13-0/engines/kyra/staticres.cpp	2009-04-16 12:39:54 UTC (rev 39963)
@@ -1292,7 +1292,9 @@
 	static const char *tIntro98[] = { "intro%d.dat" };
 	static const char *tIngame98[] = { "kyram%d.dat" };
 
-	if (_flags.platform == Common::kPlatformPC) {
+	// FIXME: It seems Kyra1 MAC CD includes AdLib and MIDI music and sfx, thus we enable
+	// support for those for now. (Based on patch #2767489 "Support for Mac Kyrandia 1 CD" by satz).
+	if (_flags.platform == Common::kPlatformPC || _flags.platform == Common::kPlatformMacintosh) {
 		_soundData[0]._fileList = _soundFilesIntro;
 		_soundData[0]._fileListLen = _soundFilesIntroSize;
 		_soundData[0]._cdaTracks = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.