[Scummvm-git-logs] scummvm master -> 2c53d1f62b63fee5c180bf89cdad27a856c96322
sev-
noreply at scummvm.org
Wed Nov 23 12:23:29 UTC 2022
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e269f55f50 MOHAWK: Add games not yet suppoted by engine to detection and mark them as such
11f78ebad8 DIRECTOR: Clarify orly that it is director.
67feb18eed MOHAWK: Added detection for orly and alientales demos
a936f3783d MOHAWK: Added existing zoombini demos to detection
2c53d1f62b MOHAWK: Added new Japanese zoombini demo to detection
Commit: e269f55f501a9f1b32c471a4451d68c2202055f3
https://github.com/scummvm/scummvm/commit/e269f55f501a9f1b32c471a4451d68c2202055f3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-23T13:23:12+01:00
Commit Message:
MOHAWK: Add games not yet suppoted by engine to detection and mark them as such
This effectively reverts 44fd44ccc965b91a38c534e0a890772e83577c4b
We use detection for documentation purposes, to reduce time spent
on game cataloging and also indicate to the devs where they could
explore
Changed paths:
engines/mohawk/detection.cpp
engines/mohawk/detection.h
engines/mohawk/detection_tables.h
engines/mohawk/resource.h
engines/mohawk/sound.cpp
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index 46943b8d005..01b21616e45 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -36,12 +36,19 @@ static const PlainGameDescriptor mohawkGames[] = {
{"myst", "Myst"},
{"makingofmyst", "The Making of Myst"},
{"riven", "Riven: The Sequel to Myst"},
+ {"zoombini", "Logical Journey of the Zoombinis"},
{"cstime", "Where in Time is Carmen Sandiego?"},
+ {"csworld", "Where in the World is Carmen Sandiego?"},
+ {"csamtrak", "Where in America is Carmen Sandiego? (The Great Amtrak Train Adventure)"},
{"carmentq", "Carmen Sandiego's ThinkQuick Challenge"},
{"carmentqc", "Carmen Sandiego's ThinkQuick Challenge Custom Question Creator"},
{"maggiesfa", "Maggie's Farmyard Adventure"},
+ {"jamesmath", "James Discovers/Explores Math"},
+ {"treehouse", "The Treehouse"},
{"greeneggs", "Green Eggs and Ham"},
{"seussabc", "Dr Seuss's ABC"},
+ {"1stdegree", "In the 1st Degree"},
+ {"csusa", "Where in the USA is Carmen Sandiego?"},
{"seussps", "Dr Seuss's Preschool"},
{"tortoise", "Aesop's Fables: The Tortoise and the Hare"},
{"arthur", "Arthur's Teacher Trouble"},
diff --git a/engines/mohawk/detection.h b/engines/mohawk/detection.h
index ad5d0688a04..cfe4c5811ef 100644
--- a/engines/mohawk/detection.h
+++ b/engines/mohawk/detection.h
@@ -35,7 +35,14 @@ enum MohawkGameType {
GType_LIVINGBOOKSV2,
GType_LIVINGBOOKSV3,
GType_LIVINGBOOKSV4,
- GType_LIVINGBOOKSV5
+ GType_LIVINGBOOKSV5,
+ GType_ZOOMBINI,
+ GType_CSWORLD,
+ GType_CSAMTRAK,
+ GType_JAMESMATH,
+ GType_TREEHOUSE,
+ GType_1STDEGREE,
+ GType_CSUSA,
};
#define GAMEOPTION_ME GUIO_GAMEOPTIONS1
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index b707a330f1b..023399e7d8d 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -758,6 +758,123 @@ static const MohawkGameDescription gameDescriptions[] = {
0
},
+ {
+ {
+ "zoombini",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("ZOOMBINI.MHK", "98b758fec55104c096cfd129048be9a6"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ZOOMBINI,
+ 0,
+ 0
+ },
+
+ {
+ {
+ "zoombini",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("ZOOMBINI.MHK", "0672f65c40dd065840c896e41c13f980"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ZOOMBINI,
+ 0,
+ 0
+ },
+
+ {
+ {
+ "zoombini",
+ _s("Missing game code"), // Reason for being unsupported // "v2.0",
+ AD_ENTRY1("ZOOMBINI.MHK", "506b1122ffa740e2566cf0b583d24478"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ZOOMBINI,
+ 0,
+ 0
+ },
+ {
+ {
+ "zoombini",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("ZOOMBINI.MHK", "6ae0bdf791266b1fe3d4fabbf44c3faa"),
+ Common::DE_DEU,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ZOOMBINI,
+ 0,
+ 0
+ },
+ {
+ {
+ "zoombini",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("ZOOMBINI.MHK", "8231e58525143ccf6e8b747df34b139f"),
+ Common::FR_FRA,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ZOOMBINI,
+ 0,
+ 0
+ },
+
+ {
+ {
+ "csworld",
+ _s("Missing game code"), // Reason for being unsupported // "v3.0",
+ AD_ENTRY1("C2K.MHK", "605fe88380848031bbd0ff84ade6fe40"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_CSWORLD,
+ 0,
+ 0
+ },
+ {
+ {
+ "csworld",
+ _s("Missing game code"), // Reason for being unsupported // "v3.5",
+ AD_ENTRY1("C2K.MHK", "d4857aeb0f5e2e0c4ac556aa74f38c23"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_CSWORLD,
+ 0,
+ 0
+ },
+
+ {
+ {
+ "csamtrak",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("AMTRAK.MHK", "2f95301f0bb950d555bb7b0e3b1b7eb1"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_CSAMTRAK,
+ 0,
+ 0
+ },
+
// Harry and the Haunted House v1.0E
// English Windows 3.11
// From strangerke
@@ -987,6 +1104,52 @@ static const MohawkGameDescription gameDescriptions[] = {
0
},
+ {
+ {
+ "jamesmath",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("BRODER.MHK", "007299da8b2c6e8ec1cde9598c243024"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_JAMESMATH,
+ 0,
+ 0
+ },
+
+ // This is in the NEWDATA folder, so I assume it's a newer version ;)
+ {
+ {
+ "jamesmath",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("BRODER.MHK", "53c000938a50dca92860fd9b546dd276"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_JAMESMATH,
+ 0,
+ 0
+ },
+
+ {
+ {
+ "treehouse",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("MAINROOM.MHK", "12f51894d7f838af639ea9bf1bc8f45b"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_TREEHOUSE,
+ 0,
+ 0
+ },
+
{
{
"greeneggs",
@@ -1154,6 +1317,54 @@ static const MohawkGameDescription gameDescriptions[] = {
0
},
+ {
+ {
+ "1stdegree",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("AL236_1.MHK", "3ba145492a7b8b4dee0ef4222c5639c3"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_1STDEGREE,
+ 0,
+ 0
+ },
+
+ // In The 1st Degree
+ // French Windows
+ // From Strangerke
+ {
+ {
+ "1stdegree",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("AL236_1.MHK", "0e0c70b1b702b6ddca61a1192ada1282"),
+ Common::FR_FRA,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_1STDEGREE,
+ 0,
+ 0
+ },
+
+ {
+ {
+ "csusa",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1("USAC2K.MHK", "b8c9d3a2586f62bce3a48b50d7a700e9"),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_CSUSA,
+ 0,
+ 0
+ },
+
{
{
"tortoise",
diff --git a/engines/mohawk/resource.h b/engines/mohawk/resource.h
index 4daa5057372..b4b7204a02a 100644
--- a/engines/mohawk/resource.h
+++ b/engines/mohawk/resource.h
@@ -92,6 +92,10 @@ namespace Mohawk {
#define ID_BMAP MKTAG('B','M','A','P') // Old Mohawk Bitmap
#define ID_BCOD MKTAG('B','C','O','D') // Book Code
+// JamesMath Resource FourCC's
+#define ID_TANM MKTAG('t','A','N','M') // Animation?
+#define ID_TMFO MKTAG('t','M','F','O') // ???
+
// CSTime Resource FourCC's
#define ID_CINF MKTAG('C','I','N','F') // Case Info
#define ID_CONV MKTAG('C','O','N','V') // Conversation
@@ -107,6 +111,10 @@ namespace Mohawk {
#define ID_DATA MKTAG('D','a','t','a') // Game Sound Chunk
#define ID_CUE MKTAG('C','u','e','#') // Game Sound Chunk
+// Mohawk MIDI Tags
+#define ID_MIDI MKTAG('M','I','D','I') // Game Sound (Third Tag), instead of WAVE
+#define ID_PRG MKTAG('P','r','g','#') // MIDI Patch
+
// Common Resource FourCC's
#define ID_TBMP MKTAG('t','B','M','P') // Standard Mohawk Bitmap
#define ID_TWAV MKTAG('t','W','A','V') // Standard Mohawk Sound
diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index 25791721943..e0a674f2112 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -196,6 +196,9 @@ Audio::RewindableAudioStream *Sound::makeAudioStream(uint16 id, CueList *cueList
Audio::RewindableAudioStream *audStream = nullptr;
switch (_vm->getGameType()) {
+ case GType_ZOOMBINI:
+ audStream = makeMohawkWaveStream(_vm->getResource(ID_SND, id));
+ break;
case GType_LIVINGBOOKSV1:
audStream = makeLivingBooksWaveStream_v1(_vm->getResource(ID_WAV, id));
break;
Commit: 11f78ebad82cf4b1a274a1cfb7cf71bfcd7bb4d6
https://github.com/scummvm/scummvm/commit/11f78ebad82cf4b1a274a1cfb7cf71bfcd7bb4d6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-23T13:23:12+01:00
Commit Message:
DIRECTOR: Clarify orly that it is director.
The game has both Director and Mohawk sitting in the same directory
Changed paths:
engines/director/detection_tables.h
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 3c98a4924c9..fe3c92477cd 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -5585,7 +5585,7 @@ static const DirectorGameDescription gameDescriptions[] = {
MACGAME1_l("nycalling", "", "NYC_PPC", "67c3c173091ee69b1e67a5ac494cc3c7", 108452, Common::JA_JPN, 501),
WINGAME1t_l("nycalling", "", "NYC.EXE", "7637d3433f7b8679fe1ff4b4f1c25a24", 1409654, Common::JA_JPN, 501),
- WINDEMO1("orly", "Demo", "_ORLYDEM.EXE", "2e62abdad839e42068afdcd0644d7dcf", 917641, 500),
+ WINDEMO1("orly", "Director Demo", "_ORLYDEM.EXE", "2e62abdad839e42068afdcd0644d7dcf", 917641, 500),
MACDEMO1_l("osaka2", "Demo", "OSAKA2", "2e75b0d7a218c71d5dd00a27eb755f00", 719012, Common::JA_JPN, 501),
WINDEMO1_l("osaka2", "Demo", "OSAKA2.EXE", "38b75ecdedf662326fe4931a68ae60cd", 1410110, Common::JA_JPN, 501),
Commit: 67feb18eedd7693891c5655ef7b785e462a7666f
https://github.com/scummvm/scummvm/commit/67feb18eedd7693891c5655ef7b785e462a7666f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-23T13:23:12+01:00
Commit Message:
MOHAWK: Added detection for orly and alientales demos
Changed paths:
engines/mohawk/detection.cpp
engines/mohawk/detection.h
engines/mohawk/detection_tables.h
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index 01b21616e45..2dd63f7cea1 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -37,6 +37,8 @@ static const PlainGameDescriptor mohawkGames[] = {
{"makingofmyst", "The Making of Myst"},
{"riven", "Riven: The Sequel to Myst"},
{"zoombini", "Logical Journey of the Zoombinis"},
+ {"alientales", "Alien Tales"},
+ {"orly", "Orly's Draw-A-Story"},
{"cstime", "Where in Time is Carmen Sandiego?"},
{"csworld", "Where in the World is Carmen Sandiego?"},
{"csamtrak", "Where in America is Carmen Sandiego? (The Great Amtrak Train Adventure)"},
diff --git a/engines/mohawk/detection.h b/engines/mohawk/detection.h
index cfe4c5811ef..e16dccda188 100644
--- a/engines/mohawk/detection.h
+++ b/engines/mohawk/detection.h
@@ -43,6 +43,8 @@ enum MohawkGameType {
GType_TREEHOUSE,
GType_1STDEGREE,
GType_CSUSA,
+ GType_ORLY,
+ GType_ALIENTALES,
};
#define GAMEOPTION_ME GUIO_GAMEOPTIONS1
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 023399e7d8d..f3523f805d1 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -831,6 +831,36 @@ static const MohawkGameDescription gameDescriptions[] = {
0
},
+ {
+ {
+ "orly",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1s("DEMO_STO.MHK", "9ab19aa65e72ae34ce3ec2c54f4e6f8b", 6245780),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED | ADGF_DEMO,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ORLY,
+ 0,
+ 0
+ },
+
+ {
+ {
+ "alientales",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1s("ATDEMO.DAT", "7ac30ba63080cd5ad6af9946707e01cc", 1656768),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED | ADGF_DEMO,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ORLY,
+ 0,
+ 0
+ },
+
{
{
"csworld",
Commit: a936f3783d2bf686e10e3973c55cf13c0a71b1bb
https://github.com/scummvm/scummvm/commit/a936f3783d2bf686e10e3973c55cf13c0a71b1bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-23T13:23:12+01:00
Commit Message:
MOHAWK: Added existing zoombini demos to detection
Changed paths:
engines/mohawk/detection_tables.h
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index f3523f805d1..ed728175014 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -830,6 +830,48 @@ static const MohawkGameDescription gameDescriptions[] = {
0,
0
},
+ {
+ {
+ "zoombini",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1s("ZOOMBINI.MHK", "6d95ef2148043b51ef31d3a35d3b7521", 23853146),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_UNSUPPORTED | ADGF_DEMO,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ZOOMBINI,
+ 0,
+ 0
+ },
+ {
+ {
+ "zoombini",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1s("ZOOMBINI.MHK", "8191a3568facff94cecc8d99f83a7772", 1964112),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED | ADGF_DEMO,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ZOOMBINI,
+ 0,
+ 0
+ },
+ {
+ {
+ "zoombini",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1s("ZOOMBINI.MHK", "cfa2db71d571a40a4ae692606547e391", 1492603),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_UNSUPPORTED | ADGF_DEMO,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ZOOMBINI,
+ 0,
+ 0
+ },
{
{
Commit: 2c53d1f62b63fee5c180bf89cdad27a856c96322
https://github.com/scummvm/scummvm/commit/2c53d1f62b63fee5c180bf89cdad27a856c96322
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-23T13:23:13+01:00
Commit Message:
MOHAWK: Added new Japanese zoombini demo to detection
Changed paths:
engines/mohawk/detection_tables.h
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index ed728175014..607652dd98d 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -872,6 +872,20 @@ static const MohawkGameDescription gameDescriptions[] = {
0,
0
},
+ {
+ {
+ "zoombini",
+ _s("Missing game code"), // Reason for being unsupported,
+ AD_ENTRY1s("ZOOMBINI.MHK", "3133e8d164958f8a3f740cb1f4e49f15", 24120142),
+ Common::JA_JAP,
+ Common::kPlatformMacintosh,
+ ADGF_UNSUPPORTED | ADGF_DEMO,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_ZOOMBINI,
+ 0,
+ 0
+ },
{
{
More information about the Scummvm-git-logs
mailing list