[Scummvm-git-logs] scummvm master -> 84866d6f418ba5169d2b85fdbbeba205d6372d00
sev-
sev at scummvm.org
Sat Feb 18 21:10:35 CET 2017
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:
ef07ed0774 DIRECTOR: Fix CAS* reading for Windows
6e6f1b1d04 DIRECTOR: Fixed Shared cast filename setting
84866d6f41 DIRECTOR: Add detection for Meet Mediaband
Commit: ef07ed077469ed6f405b4746a728a2cfc8147a2f
https://github.com/scummvm/scummvm/commit/ef07ed077469ed6f405b4746a728a2cfc8147a2f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-18T21:10:22+01:00
Commit Message:
DIRECTOR: Fix CAS* reading for Windows
Changed paths:
engines/director/archive.cpp
diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index c9b6cc1..f426107 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -441,14 +441,13 @@ bool RIFXArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
debugCN(2, kDebugLoading, "CAS*: %d [", casSize);
for (uint i = 0; i < casSize; i++) {
- uint32 index = casStream.readUint32();
+ uint32 index = casStream.readUint32BE();
+ debugCN(2, kDebugLoading, "%d ", index);
Resource &res = resources[index];
res.index = index;
res.castId = i + 1;
_types[castTag][res.castId] = res;
-
- debugCN(2, kDebugLoading, "%d ", index);
}
debugC(2, kDebugLoading, "]");
}
Commit: 6e6f1b1d04d371958ac8122064a7162b2a921bc9
https://github.com/scummvm/scummvm/commit/6e6f1b1d04d371958ac8122064a7162b2a921bc9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-18T21:10:22+01:00
Commit Message:
DIRECTOR: Fixed Shared cast filename setting
Changed paths:
engines/director/director.cpp
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 89c8aef..a389c8e 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -138,13 +138,14 @@ Common::Error DirectorEngine::run() {
//_mainArchive = new RIFFArchive();
//_mainArchive->openFile("bookshelf_example.mmm");
- if (getPlatform() == Common::kPlatformWindows) {
- _sharedCastFile = "SHARDCST.MMM";
- } else {
- if (getVersion() < 4)
+ if (getVersion() < 4) {
+ if (getPlatform() == Common::kPlatformWindows) {
+ _sharedCastFile = "SHARDCST.MMM";
+ } else {
_sharedCastFile = "Shared Cast";
- else
- _sharedCastFile = "Shared.dir";
+ }
+ } else {
+ _sharedCastFile = "Shared.dir";
}
loadSharedCastsFrom(_sharedCastFile);
Commit: 84866d6f418ba5169d2b85fdbbeba205d6372d00
https://github.com/scummvm/scummvm/commit/84866d6f418ba5169d2b85fdbbeba205d6372d00
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-18T21:10:22+01:00
Commit Message:
DIRECTOR: Add detection for Meet Mediaband
Changed paths:
engines/director/detection.cpp
engines/director/detection_tables.h
engines/director/director.cpp
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index c26084a..43c5bf2 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -78,6 +78,7 @@ static const PlainGameDescriptor directorGames[] = {
{ "jewels", "Jewels of the Oracle" },
{ "jman", "The Journeyman Project" },
{ "majestic", "Majestic Part I: Alien Encounter" },
+ { "mediaband", "Meet Mediaband" },
{ "melements", "Masters of the Elements" },
{ "spyclub", "Spy Club" },
{ "amber", "AMBER: Journeys Beyond"},
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 15bdf37..95ddd25 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -291,6 +291,20 @@ static const DirectorGameDescription gameDescriptions[] = {
4
},
+ { // Meet Mediaband
+ {
+ "mediaband",
+ "",
+ AD_ENTRY1s("MEDIABND.EXE", "0cfb9b4762e33ab56d656a0eb146a048", 717921),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GID_GENERIC,
+ 4
+ },
+
{
{
// Masters of the Elements - English (from rootfather)
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index a389c8e..0577579 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -84,6 +84,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
const Common::FSNode gameDataDir(ConfMan.get("path"));
SearchMan.addSubDirectoryMatching(gameDataDir, "data");
SearchMan.addSubDirectoryMatching(gameDataDir, "install");
+ SearchMan.addSubDirectoryMatching(gameDataDir, "main"); // Meet Mediaband
_colorDepth = 8; // 256-color
_key = 0;
More information about the Scummvm-git-logs
mailing list