[Scummvm-git-logs] scummvm master -> fbfe0280a9d2a04f54f798bcb8918f4fd809795b
sev-
noreply at scummvm.org
Thu Dec 8 18:09:43 UTC 2022
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:
3e12c9ddc2 COMPOSER: Load book config from MacBinary
76737d131d COMPOSER: Fix macintosh detection entries for v1
fbfe0280a9 COMPOSER: Fix typo in demo title
Commit: 3e12c9ddc2dc6073bf6f7e4013fb1e3d9458c9f3
https://github.com/scummvm/scummvm/commit/3e12c9ddc2dc6073bf6f7e4013fb1e3d9458c9f3
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2022-12-08T19:09:38+01:00
Commit Message:
COMPOSER: Load book config from MacBinary
Changed paths:
common/ini-file.cpp
common/ini-file.h
engines/composer/metaengine.cpp
diff --git a/common/ini-file.cpp b/common/ini-file.cpp
index 3cdaa54d87f..93f1a818bad 100644
--- a/common/ini-file.cpp
+++ b/common/ini-file.cpp
@@ -24,6 +24,7 @@
#include "common/savefile.h"
#include "common/system.h"
#include "common/textconsole.h"
+#include "common/macresman.h"
namespace Common {
@@ -65,6 +66,14 @@ bool INIFile::loadFromFile(const String &filename) {
return false;
}
+bool INIFile::loadFromFileOrDataFork(const String &filename) {
+ SeekableReadStream *file = Common::MacResManager::openFileOrDataFork(filename);
+ if (file)
+ return loadFromStream(*file);
+ else
+ return false;
+}
+
bool INIFile::loadFromSaveFile(const String &filename) {
assert(g_system);
SaveFileManager *saveFileMan = g_system->getSavefileManager();
diff --git a/common/ini-file.h b/common/ini-file.h
index 51fad418b2f..d6665f49611 100644
--- a/common/ini-file.h
+++ b/common/ini-file.h
@@ -106,6 +106,7 @@ public:
void clear();
bool loadFromFile(const String &filename); /*!< Load configuration from a file. */
+ bool loadFromFileOrDataFork(const String &filename); /*!< Load configuration from a file in MacBinary format. */
bool loadFromSaveFile(const String &filename); /*!< Load configuration from a save file. */
bool loadFromStream(SeekableReadStream &stream); /*!< Load configuration from a @ref SeekableReadStream. */
bool saveToFile(const String &filename); /*!< Save the current configuration to a file. */
diff --git a/engines/composer/metaengine.cpp b/engines/composer/metaengine.cpp
index 828d27d9cd5..9cb8e1ea3b5 100644
--- a/engines/composer/metaengine.cpp
+++ b/engines/composer/metaengine.cpp
@@ -54,12 +54,12 @@ bool ComposerEngine::loadDetectedConfigFile(Common::INIFile &configFile) const {
const ADGameFileDescription *res = _gameDescription->desc.filesDescriptions;
while (res->fileName != nullptr) {
if (res->fileType == GAME_CONFIGFILE) {
- return configFile.loadFromFile(res->fileName);
+ return configFile.loadFromFileOrDataFork(res->fileName);
}
res++;
}
// default config file name
- return configFile.loadFromFile("book.ini") || configFile.loadFromFile("book.mac");
+ return configFile.loadFromFileOrDataFork("book.ini") || configFile.loadFromFileOrDataFork("book.mac");
}
} // End of namespace Composer
Commit: 76737d131d64ed885f9067f03556bf5ff9cbc700
https://github.com/scummvm/scummvm/commit/76737d131d64ed885f9067f03556bf5ff9cbc700
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2022-12-08T19:09:38+01:00
Commit Message:
COMPOSER: Fix macintosh detection entries for v1
Changed paths:
engines/composer/detection_tables.h
diff --git a/engines/composer/detection_tables.h b/engines/composer/detection_tables.h
index b3885f486dc..6e1a2e769c2 100644
--- a/engines/composer/detection_tables.h
+++ b/engines/composer/detection_tables.h
@@ -148,12 +148,12 @@ static const ComposerGameDescription gameDescriptions[] = {
"imoking",
0,
{
- {"book.mac", GAME_CONFIGFILE, "4896a22874bb660f5ba26a0af111f9c0", 1868},
+ {"book.mac", GAME_CONFIGFILE, "d09a628d147506be1dee854bc9f66664", 102},
AD_LISTEND
},
Common::HE_ISR,
Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
+ ADGF_MACRESFORK,
GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
},
GType_ComposerV1
@@ -199,12 +199,12 @@ static const ComposerGameDescription gameDescriptions[] = {
"babayaga",
"Magic Tales: Baba Yaga and the Magic Geese Demo",
{
- {"book.mac", GAME_CONFIGFILE, "ed4a902df3b26d58e9c013f814a30ee8", 134},
+ {"book.mac", GAME_CONFIGFILE, "a4a125f0d000ad4ea8f33a10b1dbab2a", 76},
AD_LISTEND
},
Common::EN_ANY,
Common::kPlatformMacintosh,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ ADGF_USEEXTRAASTITLE | ADGF_MACRESFORK | ADGF_DEMO,
GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
},
GType_ComposerV1
@@ -216,12 +216,12 @@ static const ComposerGameDescription gameDescriptions[] = {
"littlesamurai",
"Magic Tales: The Little Samurai Demo",
{
- {"book.mac", GAME_CONFIGFILE, "57a82d563800001ed88b2742c3650a2d", 136},
+ {"book.mac", GAME_CONFIGFILE, "1593836491edb4a5d68354c072bf729d", 76},
AD_LISTEND
},
Common::EN_ANY,
Common::kPlatformMacintosh,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ ADGF_USEEXTRAASTITLE | ADGF_MACRESFORK | ADGF_DEMO,
GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
},
GType_ComposerV1
@@ -337,12 +337,12 @@ static const ComposerGameDescription gameDescriptions[] = {
"littlesamurai",
0,
{
- {"book.mac", GAME_CONFIGFILE, "190158751630f69c2b6cf146aa2f1efc", 1874},
+ {"book.mac", GAME_CONFIGFILE, "542f47cac09a903d34ac7f3e62400a64", 76},
AD_LISTEND
},
Common::HE_ISR,
Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
+ ADGF_MACRESFORK,
GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
},
GType_ComposerV1
@@ -388,12 +388,12 @@ static const ComposerGameDescription gameDescriptions[] = {
"magictales",
"Magic Tales Demo: Baby Yaga, Samurai, Imo",
{
- {"demo.mac", GAME_CONFIGFILE, "6e775cda6539102d1ddee852bebf32c1", 488},
+ {"demo.mac", GAME_CONFIGFILE, "240fc2fbbc2a1a915e0adabde98b4a12", 404},
AD_LISTEND
},
Common::HE_ISR,
Common::kPlatformMacintosh,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ ADGF_USEEXTRAASTITLE | ADGF_MACRESFORK | ADGF_DEMO,
GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
},
GType_ComposerV1
Commit: fbfe0280a9d2a04f54f798bcb8918f4fd809795b
https://github.com/scummvm/scummvm/commit/fbfe0280a9d2a04f54f798bcb8918f4fd809795b
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2022-12-08T19:09:38+01:00
Commit Message:
COMPOSER: Fix typo in demo title
Changed paths:
engines/composer/detection_tables.h
diff --git a/engines/composer/detection_tables.h b/engines/composer/detection_tables.h
index 6e1a2e769c2..4219440d0d0 100644
--- a/engines/composer/detection_tables.h
+++ b/engines/composer/detection_tables.h
@@ -352,7 +352,7 @@ static const ComposerGameDescription gameDescriptions[] = {
{
{
"magictales",
- "Magic Tales Demo: Baby Yaga, Samurai, Imo",
+ "Magic Tales Demo: Baba Yaga, Samurai, Imo",
{
{"book.ini", GAME_CONFIGFILE, "dbc98c566f4ac61b544443524585dccb", -1},
AD_LISTEND
@@ -369,7 +369,7 @@ static const ComposerGameDescription gameDescriptions[] = {
{
{
"magictales",
- "Magic Tales Demo: Baby Yaga, Samurai, Imo",
+ "Magic Tales Demo: Baba Yaga, Samurai, Imo",
{
{"demo.ini", GAME_CONFIGFILE, "ea784af960375834d655eb7281cd4500", -1},
AD_LISTEND
@@ -386,7 +386,7 @@ static const ComposerGameDescription gameDescriptions[] = {
{
{
"magictales",
- "Magic Tales Demo: Baby Yaga, Samurai, Imo",
+ "Magic Tales Demo: Baba Yaga, Samurai, Imo",
{
{"demo.mac", GAME_CONFIGFILE, "240fc2fbbc2a1a915e0adabde98b4a12", 404},
AD_LISTEND
More information about the Scummvm-git-logs
mailing list