[Scummvm-git-logs] scummvm master -> c7cec081d19fce06eda78547f539f9dcfbc12248
sev-
sev at scummvm.org
Mon Apr 26 13:18:14 UTC 2021
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:
c1e18cbb90 COMMON: Added more debug output to installshield
85931b85c5 AGOS: Added support for German 4CD Feeble unpacked. Bugreport #11541
c7cec081d1 AGOS: Do not use sole data1.cab for detection
Commit: c1e18cbb90a1a9be6308eeef66dabc996ee6b95a
https://github.com/scummvm/scummvm/commit/c1e18cbb90a1a9be6308eeef66dabc996ee6b95a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-26T14:50:20+02:00
Commit Message:
COMMON: Added more debug output to installshield
Changed paths:
common/installshield_cab.cpp
diff --git a/common/installshield_cab.cpp b/common/installshield_cab.cpp
index a7fcf81607..b953952ea2 100644
--- a/common/installshield_cab.cpp
+++ b/common/installshield_cab.cpp
@@ -90,8 +90,9 @@ InstallShieldCabinet::InstallShieldCabinet(SeekableReadStream *stream, DisposeAf
// cabinets.
// Check for the magic uint32
- if (_stream->readUint32LE() != 0x28635349) {
- warning("InstallShieldCabinet::InstallShieldCabinet(): Magic ID doesn't match");
+ uint32 magic = _stream->readUint32LE();
+ if (magic != 0x28635349) {
+ warning("InstallShieldCabinet::InstallShieldCabinet(): Magic ID doesn't match: expecting %x but got %x", 0x28635349, magic);
return;
}
Commit: 85931b85c5e3cbf835ba45b38401260ffebc2f4b
https://github.com/scummvm/scummvm/commit/85931b85c5e3cbf835ba45b38401260ffebc2f4b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-26T14:51:10+02:00
Commit Message:
AGOS: Added support for German 4CD Feeble unpacked. Bugreport #11541
Changed paths:
engines/agos/detection_tables.h
engines/agos/intern_detection.h
engines/agos/metaengine.cpp
diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index 8541772370..f8381dfbc2 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/detection_tables.h
@@ -2897,7 +2897,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"2CD",
{
- { "data1.cab", 0, "600db08891e7a21badc8215e604cd88f", 28845430},
+ { "data1.cab", GAME_CABFILE, "600db08891e7a21badc8215e604cd88f", 28845430},
AD_LISTEND
},
Common::EN_ANY,
@@ -2964,7 +2964,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"4CD",
{
- { "data1.cab", 0, "65804cbc9036ac4b1275d97e0de3be2f", 28943062},
+ { "data1.cab", GAME_CABFILE, "65804cbc9036ac4b1275d97e0de3be2f", 28943062},
AD_LISTEND
},
Common::EN_ANY,
@@ -3047,6 +3047,28 @@ static const AGOSGameDescription gameDescriptions[] = {
GF_OLD_BUNDLE | GF_TALKIE
},
+ // The Feeble Files - German Windows 4CD (with InstallShield cab)
+ {
+ {
+ "feeble",
+ "4CD/unextracted",
+
+ {
+ { "data1.cab", GAME_CABFILE, "600ece2bc02cfffd17afce721bc5ab21", 23201553},
+ { "0882.vga", 0, "6655780ef361ed92d0a99d50217502f3", 713180},
+ AD_LISTEND
+ },
+ Common::DE_DEU,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO3(GUIO_NOSUBTITLES, GUIO_NOMUSIC, GUIO_NOASPECT)
+ },
+
+ GType_FF,
+ GID_FEEBLEFILES,
+ GF_OLD_BUNDLE | GF_TALKIE | GF_PACKED
+ },
+
// The Feeble Files - Italian Windows 4CD
{
{
@@ -3123,7 +3145,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "data1.cab", 0, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
+ { "data1.cab", GAME_CABFILE, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
AD_LISTEND
},
Common::EN_ANY,
@@ -3165,7 +3187,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "data1.cab", 0, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
+ { "data1.cab", GAME_CABFILE, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
AD_LISTEND
},
Common::EN_ANY,
@@ -3207,7 +3229,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "data1.cab", 0, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
+ { "data1.cab", GAME_CABFILE, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
AD_LISTEND
},
Common::EN_ANY,
@@ -3249,7 +3271,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "data1.cab", 0, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
+ { "data1.cab", GAME_CABFILE, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
AD_LISTEND
},
Common::EN_ANY,
diff --git a/engines/agos/intern_detection.h b/engines/agos/intern_detection.h
index 04d9d1e7a7..5c065a1287 100644
--- a/engines/agos/intern_detection.h
+++ b/engines/agos/intern_detection.h
@@ -72,8 +72,9 @@ enum GameFileTypes {
GAME_RESTFILE = 1 << 9,
GAME_TEXTFILE = 1 << 10,
GAME_VGAFILE = 1 << 11,
+ GAME_GFXIDXFILE = 1 << 12,
+ GAME_CABFILE = 1 << 13
- GAME_GFXIDXFILE = 1 << 12
};
diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp
index c33a6b994b..803167cd17 100644
--- a/engines/agos/metaengine.cpp
+++ b/engines/agos/metaengine.cpp
@@ -203,6 +203,9 @@ void AGOSEngine::loadArchives() {
if (getFeatures() & GF_PACKED) {
for (ag = _gameDescription->desc.filesDescriptions; ag->fileName; ag++) {
+ if (ag->fileType != GAME_CABFILE)
+ continue;
+
if (!SearchMan.hasArchive(ag->fileName)) {
Common::SeekableReadStream *stream = SearchMan.createReadStreamForMember(ag->fileName);
Commit: c7cec081d19fce06eda78547f539f9dcfbc12248
https://github.com/scummvm/scummvm/commit/c7cec081d19fce06eda78547f539f9dcfbc12248
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-26T15:17:49+02:00
Commit Message:
AGOS: Do not use sole data1.cab for detection
Changed paths:
engines/agos/detection_tables.h
diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index f8381dfbc2..501495816f 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/detection_tables.h
@@ -2894,10 +2894,11 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{
"feeble",
- "2CD",
+ "2CD/unextracted",
{
{ "data1.cab", GAME_CABFILE, "600db08891e7a21badc8215e604cd88f", 28845430},
+ { "0882.vga", 0, "6655780ef361ed92d0a99d50217502f3", 713180},
AD_LISTEND
},
Common::EN_ANY,
@@ -2961,10 +2962,11 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{
"feeble",
- "4CD",
+ "4CD/unextracted",
{
{ "data1.cab", GAME_CABFILE, "65804cbc9036ac4b1275d97e0de3be2f", 28943062},
+ { "0882.vga", 0, "6655780ef361ed92d0a99d50217502f3", 713180},
AD_LISTEND
},
Common::EN_ANY,
@@ -3142,10 +3144,11 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{
"dimp",
- "CD",
+ "CD/unextracted",
{
{ "data1.cab", GAME_CABFILE, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
+ { "0841.vga", 0, "b3048a73648d43ff921370da8590e5b3", 40828},
AD_LISTEND
},
Common::EN_ANY,
@@ -3184,10 +3187,11 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{
"jumble",
- "CD",
+ "CD/unextracted",
{
{ "data1.cab", GAME_CABFILE, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
+ { "0841.vga", 0, "b3048a73648d43ff921370da8590e5b3", 40828},
AD_LISTEND
},
Common::EN_ANY,
@@ -3226,10 +3230,11 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{
"puzzle",
- "CD",
+ "CD/unextracted",
{
{ "data1.cab", GAME_CABFILE, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
+ { "0841.vga", 0, "b3048a73648d43ff921370da8590e5b3", 40828},
AD_LISTEND
},
Common::EN_ANY,
@@ -3268,10 +3273,11 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{
"swampy",
- "CD",
+ "CD/unextracted",
{
{ "data1.cab", GAME_CABFILE, "36dd86c1d872cea81ac1de7753dd684a", 40394693},
+ { "0841.vga", 0, "b3048a73648d43ff921370da8590e5b3", 40828},
AD_LISTEND
},
Common::EN_ANY,
More information about the Scummvm-git-logs
mailing list