aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorAlyssa Milburn2011-08-24 16:17:47 +0200
committerAlyssa Milburn2011-08-24 16:17:47 +0200
commitee87420b64c7268ce0a18acdcbcbd1afabc2f381 (patch)
treeac53d9df0b26993dc044ad71619139cac6010c85 /engines
parent452280471bcdc17f922b70c94c2c74cfa8033462 (diff)
downloadscummvm-rg350-ee87420b64c7268ce0a18acdcbcbd1afabc2f381.tar.gz
scummvm-rg350-ee87420b64c7268ce0a18acdcbcbd1afabc2f381.tar.bz2
scummvm-rg350-ee87420b64c7268ce0a18acdcbcbd1afabc2f381.zip
COMPOSER: Detect/run Mac versions of Darby/Gregory.
Diffstat (limited to 'engines')
-rw-r--r--engines/composer/composer.cpp8
-rw-r--r--engines/composer/detection.cpp26
2 files changed, 32 insertions, 2 deletions
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index 538bd94721..085ce815dd 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 3c7d9f9cd5..a0071930ff 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",