[Scummvm-git-logs] scummvm master -> 9b3f0a96016369e1e42911e75379ba00a8277cf3
bluegr
noreply at scummvm.org
Thu Jan 9 09:55:16 UTC 2025
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:
4078d29fb7 SCUMM: Don't initialize the SE sound engine for MM
1962808333 SCUMM: Remove the platform check for SE games
9b3f0a9601 SCUMM: Add detection entries for the Mac SE versions of DOTT, FT and MM
Commit: 4078d29fb7527c579f9eafa6ca35669eff7f5934
https://github.com/scummvm/scummvm/commit/4078d29fb7527c579f9eafa6ca35669eff7f5934
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-01-09T11:54:29+02:00
Commit Message:
SCUMM: Don't initialize the SE sound engine for MM
There aren't any associated SE sounds in the PAK file
Changed paths:
engines/scumm/sound.cpp
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 4ba45b5b7ef..4d0b3fc0ee1 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -84,7 +84,10 @@ Sound::Sound(ScummEngine *parent, Audio::Mixer *mixer, bool useReplacementAudioT
_talkChannelHandle = new Audio::SoundHandle();
- if (_vm->_game.features & GF_DOUBLEFINE_PAK)
+ // Initialize the SE sound engine for all doublefine packed games,
+ // except for Maniac Mansion (within DOTT), which doesn't have
+ // associated SE resources in the PAK file.
+ if (_vm->_game.features & GF_DOUBLEFINE_PAK && _vm->_game.id != GID_MANIAC)
_soundSE = new SoundSE(_vm, _mixer);
_soundCD = new SoundCD(_vm, _mixer, _soundSE, useReplacementAudioTracks);
Commit: 1962808333006ce540db200995a4b19abce5ab52
https://github.com/scummvm/scummvm/commit/1962808333006ce540db200995a4b19abce5ab52
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-01-09T11:54:30+02:00
Commit Message:
SCUMM: Remove the platform check for SE games
This was a leftover. We rely on the GF_DOUBLEFINE_PAK game feature for
these games
Changed paths:
engines/scumm/scumm.cpp
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index dd755f241fe..8859f0191c8 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1054,7 +1054,7 @@ Common::Error ScummEngine::init() {
// Note: All of these can also occur in 'extracted' form, in which case they
// are treated like any other SCUMM game.
if (_filenamePattern.genMethod == kGenUnchanged) {
- if (_game.platform == Common::kPlatformDOS && (_game.features & GF_DOUBLEFINE_PAK)) {
+ if (_game.features & GF_DOUBLEFINE_PAK) {
// Container files used in remastered/SE versions
_containerFile = _filenamePattern.pattern; // needs to be set before instantiating ScummPAKFile
if (_game.id == GID_MANIAC)
Commit: 9b3f0a96016369e1e42911e75379ba00a8277cf3
https://github.com/scummvm/scummvm/commit/9b3f0a96016369e1e42911e75379ba00a8277cf3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-01-09T11:54:32+02:00
Commit Message:
SCUMM: Add detection entries for the Mac SE versions of DOTT, FT and MM
Although these versions have a Mac executable, the game files of the
classic versions enclosed within the PAK files are from the DOS
versions, so they are marked as DOS
Changed paths:
devtools/scumm-md5.txt
engines/scumm/detection_tables.h
engines/scumm/scumm-md5.h
diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 887d2a2f31c..a5b0dfece4b 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -73,7 +73,8 @@ maniac Maniac Mansion
be83e882b44f2767bc08d4f766ebc347 -1 de Atari V2 V2 - Joachim Eberhard
15240c59d3681ed53f714f8d925cb2d6 -1 es Atari V2 V2 - VooD
624cdb93654667c869d204a64af7e57f 1988 en DOS V2 V2 - Kirben, Andrea Petrucci
- ff678e9ef8e4af2a37ca8658833c795a 1988 en DOS SE SE - Filippos Karapetis
+ ff678e9ef8e4af2a37ca8658833c795a -1 en DOS SE SE - Filippos Karapetis
+ fb70a129635f91988e394738376bcb36 -1 en DOS SE SE - Filippos Karapetis
b250d0f9cc83f80ced56fe11a4fb057c 1988 en DOS V2 V2 alt? Andrea Petrucci, Fingolfin
114acdc2659a273c220f86ee9edb24c1 -1 fr DOS V2 V2 - Nicolas Sauzède
99a3699f80b8f776efae592b44b9b991 1988 fr DOS V2 V2 from DOTT Nicolas Sauzède, Andrea Petrucci
@@ -361,6 +362,7 @@ tentacle Day of the Tentacle
4167a92a1d46baa4f4127d918d561f88 7932 en All? - CD 1.6 Fingolfin
64d07dec2bf0789c4f2a7b656cf5bb83 2731584777 en DOS SE SE Filippos Karapetis
7ff69e4905f3c30f3a86ab8fb8cfe34b 2731425417 en DOS SE SE Filippos Karapetis
+ 66f01ce69b6007b415a9475585a7ec1f 2729086579 en DOS SE SE Filippos Karapetis
8aa05d3cdb0e795436043f0546af2da2 7932 fr All? - CD - Andrea Petrucci
6e959d65358eedf9b68b81e304b97fa4 7932 de All? - CD - Fingolfin
4fbbe9f64b8bc547503a379a301183ce -1 it All? - CD - Andrea Petrucci
@@ -409,6 +411,7 @@ ft Full Throttle
09820417db26687bb7fe0c83cc4c553b 19697 en All? - Version A - Fingolfin
60ba818dc3bede86d40357e3913f8505 19697 en All? - Version B - sev, Fingolfin
3ad7672a6c4d190f0a08ea524f711dd6 5465581773 en DOS SE SE SE Filippos Karapetis
+ c9694a19b19092d7494c586c72b7c046 5468384784 en DOS SE SE SE Filippos Karapetis
4bedb49943df95a9c900a5a82ccbe9de 19752 fr All? - - - cyx
8bdb0bf87b5e303dd35693afb9351215 -1 de All? - - - dhewg
55518cd73cf9c6d23ea29c51ee06bdfe -1 it All? - - - delfino
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 8995ccb6dcd..b8d572bb6dd 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -410,7 +410,8 @@ using Common::UNK_LANG;
static const GameFilenamePattern gameFilenamesTable[] = {
{ "maniac", "%02d.LFL", kGenRoomNum, UNK_LANG, UNK, 0 },
{ "maniac", "%02d.MAN", kGenRoomNum, UNK_LANG, UNK, "V1 Demo" },
- { "maniac", "dott.exe", kGenUnchanged, UNK_LANG, UNK, "SE" }, // Classic version within the remastered one. We don't really need this file, but it has to be different from DOTT's tenta.cle file
+ { "maniac", "dott.exe", kGenUnchanged, UNK_LANG, UNK, "SE" }, // Classic version within the remastered one. We don't really need this file, but it has to be different from DOTT's tenta.cle file (Windows version)
+ { "maniac", "dott", kGenUnchanged, UNK_LANG, UNK, "SE" }, // Classic version within the remastered one. We don't really need this file, but it has to be different from DOTT's tenta.cle file (Mac version)
{ "maniac", "maniac1.d64", kGenUnchanged, UNK_LANG, Common::kPlatformC64, "C64" }, // ... and maniac2.d64
{ "maniac", "maniac1.dsk", kGenUnchanged, UNK_LANG, Common::kPlatformApple2GS, "Apple II" }, // ... and maniac2.dsk
{ "maniac", "maniacdemo.d64", kGenUnchanged, UNK_LANG, Common::kPlatformC64, "C64 Demo" },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index d37c699bef8..b1cc5082f78 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Fri Dec 20 09:25:44 2024
+ This file was generated by the md5table tool on Thu Jan 9 09:42:14 2025
DO NOT EDIT MANUALLY!
*/
@@ -341,6 +341,7 @@ static const MD5Table md5table[] = {
{ "65fa23d6884e8ca23d5d2406d70de7e8", "puttzoo", "", "Demo", 14337, Common::FR_FRA, Common::kPlatformWindows },
{ "66236cd1aec24e1d4aff4c4cc93b7e18", "indy3", "EGA", "EGA", 5361, Common::FR_FRA, Common::kPlatformDOS },
{ "663743c03ae0c007f3d665cf631c0e6b", "puttrace", "HE 99", "Demo", 13135, Common::DE_DEU, Common::kPlatformUnknown },
+ { "66f01ce69b6007b415a9475585a7ec1f", "tentacle", "SE", "SE", 2729086579, Common::EN_ANY, Common::kPlatformDOS },
{ "66fd5ff9a810dfeb6d6bdada18221140", "monkey", "VGA", "VGA", 8357, Common::IT_ITA, Common::kPlatformDOS },
{ "672dec94b82f7f0877ebb5b5cf7f4bc1", "pajama", "", "", 66368, Common::EN_ANY, Common::kPlatformUnknown },
{ "675d71151e9b5a968c8ce46d9fbf4cbf", "zak", "V2", "V2", 1916, Common::EN_ANY, Common::kPlatformDOS },
@@ -636,6 +637,7 @@ static const MD5Table md5table[] = {
{ "c8575e0b973ff1723aba6cd92c642db2", "puttrace", "HE 99", "Demo", -1, Common::FR_FRA, Common::kPlatformWindows },
{ "c8aac5e3e701874e2fa4117896f9e1b1", "freddi", "HE 73", "Demo", 9800, Common::EN_ANY, Common::kPlatformMacintosh },
{ "c8c5baadcbfc8d0372ed4335abace8a7", "pajama3", "", "Demo", -1, Common::FR_FRA, Common::kPlatformWindows },
+ { "c9694a19b19092d7494c586c72b7c046", "ft", "SE", "SE", 5468384784, Common::EN_ANY, Common::kPlatformDOS },
{ "c9717ee6059f1e43b768b464493d2fba", "fbpack", "", "", -1, Common::JA_JPN, Common::kPlatform3DO },
{ "cb1559e8405d17a5a278a6b5ad9338d1", "freddi3", "", "Demo", 22718, Common::EN_ANY, Common::kPlatformUnknown },
{ "cb8feea195746e042368e2b738766d8b", "indy3", "VGA", "VGA", -1, Common::KO_KOR, Common::kPlatformDOS },
@@ -773,6 +775,7 @@ static const MD5Table md5table[] = {
{ "fa84cb1018103a4ee4e5fa8041c1d0d1", "freddi4", "", "Demo", 13609, Common::DE_DEU, Common::kPlatformWindows },
{ "faa89ab5e67ba4eebb4399f584f7490c", "pajama3", "", "Mini Game", 13911, Common::FR_FRA, Common::kPlatformWindows },
{ "fb66aa42de21675116346213f176a366", "monkey", "VGA", "", 8347, Common::IT_ITA, Common::kPlatformAmiga },
+ { "fb70a129635f91988e394738376bcb36", "maniac", "SE", "SE", -1 , Common::EN_ANY, Common::kPlatformDOS },
{ "fbb697d89d2beca87360a145f467bdae", "PuttTime", "HE 90", "Demo", 18403, Common::DE_DEU, Common::kPlatformUnknown },
{ "fbbbb38a81fc9d6a61d509278390a290", "farm", "HE 73", "", -1, Common::EN_ANY, Common::kPlatformMacintosh },
{ "fbdd947d21e8f5bac6d6f7a316af1c5a", "spyfox", "", "Demo", 15693, Common::EN_USA, Common::kPlatformUnknown },
@@ -785,7 +788,7 @@ static const MD5Table md5table[] = {
{ "fe60d6b5ff51b0553ac59963123b5777", "comi", "", "", 76791, Common::UNK_LANG, Common::kPlatformWindows },
{ "febf4a983ea5faea1c9dd6c710ebb09c", "puttcircus", "", "", 36655, Common::DE_DEU, Common::kPlatformWindows },
{ "ff05c07990061d97647f059c48c1d05a", "zak", "V2", "V2", -1, Common::DE_DEU, Common::kPlatformAtariST },
- { "ff678e9ef8e4af2a37ca8658833c795a", "maniac", "SE", "SE", 1988, Common::EN_ANY, Common::kPlatformDOS },
+ { "ff678e9ef8e4af2a37ca8658833c795a", "maniac", "SE", "SE", -1 , Common::EN_ANY, Common::kPlatformDOS },
{ "ff90541cd06403ebea117274a3203c49", "baseball", "", "Steam", -1, Common::EN_ANY, Common::kPlatformWindows },
{ 0, 0, 0, 0, 0, Common::UNK_LANG, Common::kPlatformUnknown }
};
More information about the Scummvm-git-logs
mailing list