[Scummvm-git-logs] scummvm master -> a7b3abb139ced084e0d026b2d6ea40dd917db57a

[mistydemeo]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4cac3b2138 DIRECTOR: fix majestic Mac filesize
a7b3abb139 DIRECTOR: update Phibos comment


Commit: 4cac3b2138a4e380d6750d66906d4fc46424e870
    https://github.com/scummvm/scummvm/commit/4cac3b2138a4e380d6750d66906d4fc46424e870
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-01-24T17:34:46-08:00

Commit Message:
DIRECTOR: fix majestic Mac filesize

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 98c924e083a..bf76c3f7c31 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -2704,6 +2704,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	// Original filename is ~LEGEND OF PSY•S CITY~
 	// English translation by Skye Sonomura (HomeStarRunnerTron)
 	MACGAME1_l("the7colors", "", "xn--~LEGEND OF PSYS CITY~-up9l", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 383745, Common::JA_JPN, 300),
+	// Alternate filename variation
+	MACGAME1_l("the7colors", "", "xn--~LEGEND OF PSYS CITY~-u558i", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 383745, Common::JA_JPN, 300),
 	MACGAME1("the7colors", "", "T7C-R!", "d84feae6ba35340857f46c9cbd6bd1a6", 398725, 300),
 	MACGAME1_l("the7colors", "No CD Yo! 6/21/15 hack", "xn--~LEGEND OF PSYS CITY~-u558i", "a6e50f2b8f294640a1d0cbe91a73e81c", 392267, Common::JA_JPN, 300),
 
@@ -4287,7 +4289,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 	WINDEMO1("madtg", "1996 Demo", "MADTG.EXE", "f53afbe0ae5126fa04adce4952a84b7f", 5867859, 404),
 
 	// German 16bit version is unconfirmed (Trac #13225)
-	MACGAME1("majestic", "", "Majestic", "01be45e7241194dad07938e7059b88e3", 483774, 400),
+	MACGAME1("majestic", "", "Majestic", "01be45e7241194dad07938e7059b88e3", 483518, 400),
 	WINGAME1("majestic", "", "MAJESTIC.EXE", "624267f70253e5327981003a6fc0aeba", 23437631, 400),
 	WINGAME1_l("majestic", "",  "Maj16.exe", "65ef7246e9ab04aff59fb734e9551727", 23688481, Common::DE_DEU, 400),
 	WINGAME1t_l("majestic", "", "Maj32.exe", "d1cced6eff47da53845679d05b5d2bf3", 24166899, Common::DE_DEU, 400),


Commit: a7b3abb139ced084e0d026b2d6ea40dd917db57a
    https://github.com/scummvm/scummvm/commit/a7b3abb139ced084e0d026b2d6ea40dd917db57a
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-01-24T17:34:46-08:00

Commit Message:
DIRECTOR: update Phibos comment

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 6bf3c0fa4ec..1cf038cd857 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -3053,7 +3053,9 @@ void LB::b_cast(int nargs) {
 void LB::b_script(int nargs) {
 	Datum d = g_lingo->pop();
 	// FIXME: Check with later versions of director
-	//        The kCastText check version breaks Phibos and Yokai Ningen Bem.
+	//        The kCastText check version breaks Phibos, which loads a
+	//        non-kCastText script using this builtin.
+	//        With the kCastText version, Phibos crashes during its intro.
 	// CastMemberID memberID = d.asMemberID(kCastText);
 	CastMemberID memberID = d.asMemberID();
 	CastMember *cast = g_director->getCurrentMovie()->getCastMember(memberID);