[Scummvm-cvs-logs] SF.net SVN: scummvm:[40074] scummvm/tags/release-0-13-1/engines/kyra

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Wed Apr 22 14:04:33 CEST 2009


Revision: 40074
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40074&view=rev
Author:   Kirben
Date:     2009-04-22 12:04:30 +0000 (Wed, 22 Apr 2009)

Log Message:
-----------
Sync fixes for Kyra game engine:
Backport of 40039, which fixed bug #2772727 "KYRA1: Sound effect loops continuously (Mac CD)".
Backport PC98 and FM-Towns detecion entry fixes (r40040 + 40041).

Modified Paths:
--------------
    scummvm/tags/release-0-13-1/engines/kyra/detection.cpp
    scummvm/tags/release-0-13-1/engines/kyra/sound.cpp

Modified: scummvm/tags/release-0-13-1/engines/kyra/detection.cpp
===================================================================
--- scummvm/tags/release-0-13-1/engines/kyra/detection.cpp	2009-04-22 11:57:11 UTC (rev 40073)
+++ scummvm/tags/release-0-13-1/engines/kyra/detection.cpp	2009-04-22 12:04:30 UTC (rev 40074)
@@ -221,7 +221,7 @@
 	{ // FM-Towns version
 		{
 			"kyra1",
-			"CD",
+			0,
 			{
 				{ "EMC.PAK", 0, "a046bb0b422061aab8e4c4689400343a", -1 },
 				{ "TWMUSIC.PAK", 0, "e53bca3a3e3fb49107d59463ec387a59", -1 },
@@ -229,14 +229,14 @@
 			},
 			Common::EN_ANY,
 			Common::kPlatformFMTowns,
-			Common::ADGF_CD
+			Common::ADGF_NO_FLAGS
 		},
 		KYRA1_TOWNS_FLAGS
 	},
 	{
 		{
 			"kyra1",
-			"CD",
+			0,
 			{
 				{ "JMC.PAK", 0, "9c5707a2a478e8167e44283246612d2c", -1 },
 				{ "TWMUSIC.PAK", 0, "e53bca3a3e3fb49107d59463ec387a59", -1 },
@@ -244,15 +244,15 @@
 			},
 			Common::JA_JPN,
 			Common::kPlatformFMTowns,
-			Common::ADGF_CD
+			Common::ADGF_NO_FLAGS
 		},
 		KYRA1_TOWNS_SJIS_FLAGS
 	},
 
-	{ // PC-9821 version
+	{ // PC-9821 (CD) version
 		{
 			"kyra1",
-			0,
+			"CD",
 			{
 				{ "EMC.PAK", 0, "a046bb0b422061aab8e4c4689400343a", -1 },
 				{ "MUSIC98.PAK", 0, "02fc212f799331b769b274e33d87b37f", -1 },
@@ -260,14 +260,14 @@
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC98,
-			Common::ADGF_NO_FLAGS
+			Common::ADGF_CD
 		},
 		KYRA1_TOWNS_FLAGS
 	},
 	{
 		{
 			"kyra1",
-			0,
+			"CD",
 			{
 				{ "JMC.PAK", 0, "9c5707a2a478e8167e44283246612d2c", -1 },
 				{ "MUSIC98.PAK", 0, "02fc212f799331b769b274e33d87b37f", -1 },
@@ -275,7 +275,7 @@
 			},
 			Common::JA_JPN,
 			Common::kPlatformPC98,
-			Common::ADGF_NO_FLAGS
+			Common::ADGF_CD
 		},
 		KYRA1_TOWNS_SJIS_FLAGS
 	},
@@ -612,22 +612,22 @@
 	{ // FM-Towns
 		{
 			"kyra2",
-			"CD",
+			0,
 			AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"),
 			Common::EN_ANY,
 			Common::kPlatformFMTowns,
-			Common::ADGF_CD
+			Common::ADGF_NO_FLAGS
 		},
 		KYRA2_TOWNS_FLAGS
 	},
 	{
 		{
 			"kyra2",
-			"CD",
+			0,
 			AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"),
 			Common::JA_JPN,
 			Common::kPlatformFMTowns,
-			Common::ADGF_CD
+			Common::ADGF_NO_FLAGS
 		},
 		KYRA2_TOWNS_SJIS_FLAGS
 	},

Modified: scummvm/tags/release-0-13-1/engines/kyra/sound.cpp
===================================================================
--- scummvm/tags/release-0-13-1/engines/kyra/sound.cpp	2009-04-22 11:57:11 UTC (rev 40073)
+++ scummvm/tags/release-0-13-1/engines/kyra/sound.cpp	2009-04-22 12:04:30 UTC (rev 40074)
@@ -196,7 +196,7 @@
 	//	XXX
 	//}
 
-	if (_flags.platform == Common::kPlatformPC) {
+	if (_flags.platform == Common::kPlatformPC || _flags.platform == Common::kPlatformMacintosh) {
 		assert(command*2+1 < _trackMapSize);
 		if (_curMusicTheme != _trackMap[command*2]) {
 			if (_trackMap[command*2] != -1 && _trackMap[command*2] != -2)


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




More information about the Scummvm-git-logs mailing list