[Scummvm-cvs-logs] scummvm master -> ee87420b64c7268ce0a18acdcbcbd1afabc2f381

fuzzie fuzzie at fuzzie.org
Wed Aug 24 16:22:00 CEST 2011


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fe64e4bd80 COMPOSER: Mark demos with ADGF_DEMO.
452280471b COMPOSER: Handle Mac-style filenames in paths.
ee87420b64 COMPOSER: Detect/run Mac versions of Darby/Gregory.


Commit: fe64e4bd80fd7a7398440f9bacd89afead8d4033
    https://github.com/scummvm/scummvm/commit/fe64e4bd80fd7a7398440f9bacd89afead8d4033
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-08-24T07:16:31-07:00

Commit Message:
COMPOSER: Mark demos with ADGF_DEMO.

Changed paths:
    engines/composer/detection.cpp



diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index d6df942..3c7d9f9 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -74,7 +74,7 @@ static const ComposerGameDescription gameDescriptions[] = {
 			AD_ENTRY1("book.ini", "dbc98c566f4ac61b544443524585dccb"),
 			Common::EN_ANY,
 			Common::kPlatformWindows,
-			ADGF_USEEXTRAASTITLE,
+			ADGF_USEEXTRAASTITLE | ADGF_DEMO,
 			Common::GUIO_NONE
 		},
 		GType_ComposerV1
@@ -101,7 +101,7 @@ static const ComposerGameDescription gameDescriptions[] = {
 			AD_ENTRY1("book.ini", "3dede2522bb0886c95667b082987a87f"),
 			Common::EN_ANY,
 			Common::kPlatformWindows,
-			ADGF_USEEXTRAASTITLE,
+			ADGF_USEEXTRAASTITLE | ADGF_DEMO,
 			Common::GUIO_NONE
 		},
 		GType_ComposerV2


Commit: 452280471bcdc17f922b70c94c2c74cfa8033462
    https://github.com/scummvm/scummvm/commit/452280471bcdc17f922b70c94c2c74cfa8033462
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-08-24T07:17:07-07:00

Commit Message:
COMPOSER: Handle Mac-style filenames in paths.

Changed paths:
    engines/composer/composer.cpp



diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index 45ca714..538bd94 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -294,7 +294,7 @@ Common::String ComposerEngine::mangleFilename(Common::String filename) {
 	uint slashesToStrip = _directoriesToStrip;
 	while (slashesToStrip--) {
 		for (uint i = 0; i < filename.size(); i++) {
-			if (filename[i] != '\\')
+			if (filename[i] != '\\' && filename[i] != ':')
 				continue;
 			filename = filename.c_str() + i + 1;
 			break;
@@ -303,7 +303,7 @@ Common::String ComposerEngine::mangleFilename(Common::String filename) {
 
 	Common::String outFilename;
 	for (uint i = 0; i < filename.size(); i++) {
-		if (filename[i] == '\\')
+		if (filename[i] == '\\' || filename[i] == ':')
 			outFilename += '/';
 		else
 			outFilename += filename[i];


Commit: ee87420b64c7268ce0a18acdcbcbd1afabc2f381
    https://github.com/scummvm/scummvm/commit/ee87420b64c7268ce0a18acdcbcbd1afabc2f381
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-08-24T07:17:47-07:00

Commit Message:
COMPOSER: Detect/run Mac versions of Darby/Gregory.

Changed paths:
    engines/composer/composer.cpp
    engines/composer/detection.cpp



diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index 538bd94..085ce81 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -81,8 +81,12 @@ Common::Error ComposerEngine::run() {
 	_directoriesToStrip = 1;
 	if (!_bookIni.loadFromFile("book.ini")) {
 		_directoriesToStrip = 0;
-		if (!_bookIni.loadFromFile("programs/book.ini"))
-			error("failed to find book.ini");
+		if (!_bookIni.loadFromFile("programs/book.ini")) {
+			// mac version?
+			if (!_bookIni.loadFromFile("Darby the Dragon.ini"))
+				if (!_bookIni.loadFromFile("Gregory.ini"))
+					error("failed to find book.ini");
+		}
 	}
 
 	uint width = 640;
diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index 3c7d9f9..a007193 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -124,6 +124,19 @@ static const ComposerGameDescription gameDescriptions[] = {
 		GType_ComposerV2
 	},
 
+	{
+		{
+			"darby",
+			0,
+			AD_ENTRY1("Darby the Dragon.ini", "d81f9214936fa70d42fc578908d4bb3d"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			Common::GUIO_NONE
+		},
+		GType_ComposerV2
+	},
+
 	{ // Provided by Strangerke, "CD-Rom 100% Malin" Pack
 		{
 			"darby",
@@ -154,6 +167,19 @@ static const ComposerGameDescription gameDescriptions[] = {
 		GType_ComposerV2
 	},
 
+	{
+		{
+			"gregory",
+			0,
+			AD_ENTRY1("Gregory.ini", "fa82f14731f28c7379c5a106df07a0d6"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			Common::GUIO_NONE
+		},
+		GType_ComposerV2
+	},
+
 	{ // Provided by Strangerke, "CD-Rom 100% Malin" Pack
 		{
 			"gregory",






More information about the Scummvm-git-logs mailing list