[Scummvm-git-logs] scummvm master -> 7642ecf0a9a8bf2afbcb16d7ba10480cefb50c07

sev- sev at scummvm.org
Tue Aug 17 12:40:45 UTC 2021


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

Summary:
72a7b8d8ab DIRECTOR: Mark D2 games and L-Zone for testing
8bc99d94d5 DIRECTOR: Enable engine by default
3cf2856e09 DIRECTOR: Add sheep to the credits
910e7403f8 DIRECTOR: Marked Win Warlock for testing too and make sure all games bear their status
6fc825a1c2 NEWS: Mention L-ZONE and Warlock support
7642ecf0a9 DEVTOOLS: Fix URL for create_classicmacfonts.sh


Commit: 72a7b8d8ab0614cc0cb881557269bed2f174192e
    https://github.com/scummvm/scummvm/commit/72a7b8d8ab0614cc0cb881557269bed2f174192e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-17T14:37:40+02:00

Commit Message:
DIRECTOR: Mark D2 games and L-Zone for testing

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 7a63eff564..8db7d72855 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -974,8 +974,10 @@ static const PlainGameDescriptor directorGames[] = {
 
 namespace Director {
 
-#define GENGAME1_(t,e,f,m,s,l,p,fl,v) 				{ { t, e, AD_ENTRY1s(f, m, s), l, p, fl, GUIO1(GUIO_NOASPECT) }, GID_GENERIC, v }
-#define GENGAME2_(t,e,f1,m1,s1,f2,m2,s2,l,p,fl,v) 	{ { t, e, AD_ENTRY2s(f1, m1, s1, f2, m2, s2), l, p, fl, GUIO1(GUIO_NOASPECT) }, GID_GENERIC, v }
+#define SUPPORT_STATUS ADGF_UNSTABLE
+
+#define GENGAME1_(t,e,f,m,s,l,p,fl,v) 				{ { t, e, AD_ENTRY1s(f, m, s), l, p, (fl | SUPPORT_STATUS), GUIO1(GUIO_NOASPECT) }, GID_GENERIC, v }
+#define GENGAME2_(t,e,f1,m1,s1,f2,m2,s2,l,p,fl,v) 	{ { t, e, AD_ENTRY2s(f1, m1, s1, f2, m2, s2), l, p, (fl | SUPPORT_STATUS), GUIO1(GUIO_NOASPECT) }, GID_GENERIC, v }
 
 #define MACGAME1(t,e,f,m,s,v) 	GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformMacintosh,ADGF_MACRESFORK,v)
 #define PIPGAME1(t,e,f,m,s,v) 	GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformPippin,ADGF_MACRESFORK,v)
@@ -1103,7 +1105,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("Osmo.BW.HC", "7efaee43e298e3a3d29607300b20147a", 796297),
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			ADGF_CD | ADGF_DEMO,
+			ADGF_CD | ADGF_DEMO | SUPPORT_STATUS,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,
@@ -1114,6 +1116,9 @@ static const DirectorGameDescription gameDescriptions[] = {
 	// On exit, pop-up says "This Presentation was created using MacroMind Director 1.1"
 	MACDEMO1_l("rosettastone", "Demo", "The Rosetta Stone", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 1379715, Common::JA_JPN, 110),
 
+#undef SUPPORT_STATUS
+#define SUPPORT_STATUS ADGF_TESTING
+
 //////////////////////////////////////////////////
 //
 // MacroMind Director v2
@@ -1149,6 +1154,15 @@ static const DirectorGameDescription gameDescriptions[] = {
 //
 //////////////////////////////////////////////////
 
+	MACGAME1("lzone", "",   "L-ZONE", 		"f5277c53bacd27936158dd3867e587e2", 392484, 300),
+	MACGAME1("lzone", "v2", "L-ZONE", 		"276bee761e48a6fd709df77d5c2f60dd", 395344, 300),
+	GENGAME1_("lzone", "",	"L-ZONE",		"9f0bb7ec7720e4f680ee3aa3d22c1c9d", 384968, Common::EN_ANY, Common::kPlatformMacintoshII,ADGF_MACRESFORK, 300),
+	WINGAME2("lzone", "",   "L_ZONE.EXE",	"65d06b5fef155a2473434571aff5bc29", 370009,
+						    "SYNER_01.MMM", "56b6f1c68e85a96bcdd01028bdec2d35", 460594, 300),
+
+#undef SUPPORT_STATUS
+#define SUPPORT_STATUS ADGF_UNSTABLE
+
 	MACDEMO1("aamn", "Demo", "AAMN", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 354645, 301),
 
 	MACGAME1_l("abrapalabra", "", "ABRAPALABRA", "bcd3c718db258701496b3c5bcb827ef2", 483774, Common::ES_ESP, 404),
@@ -1425,12 +1439,6 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME1_l("lvi", "Nº1", "LVI_8Mo", "7f443f2e63fd497a9ad85b10dc880a91", 384462, Common::FR_FRA, 310),
 	WINGAME1_l("lvi", "Nº1", "LVI.EXE", "65d06b5fef155a2473434571aff5bc29", 634203, Common::FR_FRA, 310),
 
-	MACGAME1("lzone", "",   "L-ZONE", 		"f5277c53bacd27936158dd3867e587e2", 392484, 300),
-	MACGAME1("lzone", "v2", "L-ZONE", 		"276bee761e48a6fd709df77d5c2f60dd", 395344, 300),
-	GENGAME1_("lzone", "",	"L-ZONE",		"9f0bb7ec7720e4f680ee3aa3d22c1c9d", 384968, Common::EN_ANY, Common::kPlatformMacintoshII,ADGF_MACRESFORK, 300),
-	WINGAME2("lzone", "",   "L_ZONE.EXE",	"65d06b5fef155a2473434571aff5bc29", 370009,
-						    "SYNER_01.MMM", "56b6f1c68e85a96bcdd01028bdec2d35", 460594, 300),
-
 	MACDEMO1_l("lotus123", "Tour", "Tour of 1-2-3.v3", "1ed38b71d8d0f075483117f7fa559e7c", 367333, Common::JA_JPN, 302),
 
 	// This may be a hybrid of media from Director, HyperCard, and Farallon MediaTracks


Commit: 8bc99d94d5df2cab2e564c95f27713878d33508d
    https://github.com/scummvm/scummvm/commit/8bc99d94d5df2cab2e564c95f27713878d33508d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-17T14:37:40+02:00

Commit Message:
DIRECTOR: Enable engine by default

Changed paths:
    engines/director/configure.engine


diff --git a/engines/director/configure.engine b/engines/director/configure.engine
index 41f9a6249d..a728f86921 100644
--- a/engines/director/configure.engine
+++ b/engines/director/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine director "Macromedia Director" no
+add_engine director "Macromedia Director" yes


Commit: 3cf2856e09426d8d12eb856fcbc601729a6d96b1
    https://github.com/scummvm/scummvm/commit/3cf2856e09426d8d12eb856fcbc601729a6d96b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-17T14:37:40+02:00

Commit Message:
DIRECTOR: Add sheep to the credits

Changed paths:
    engines/director/credits.pl


diff --git a/engines/director/credits.pl b/engines/director/credits.pl
index 52d8b9a9d2..402266e125 100644
--- a/engines/director/credits.pl
+++ b/engines/director/credits.pl
@@ -1,8 +1,9 @@
 begin_section("Director");
 	add_person("Eugene Sandulenko", "sev", "");
+	add_person("Crane Yang", "sheep", "GSoC Student");
 	add_person("Dmitry Iskrich", "", "");
-	add_person("Dylan Servilla", "djsrv", "");
-	add_person("Nathanael Gentry", "npjg", "");
+	add_person("Dylan Servilla", "djsrv", "GSoC Student");
+	add_person("Nathanael Gentry", "npjg", "GSoC Student");
 	add_person("Roland van Laar", "rvanlaar", "");
 	add_person("Scott Percival", "moralrecordings", "");
 	add_person("Steven Hoefel", "", "");


Commit: 910e7403f841ac33dc3bd793d368a218bde4d2b9
    https://github.com/scummvm/scummvm/commit/910e7403f841ac33dc3bd793d368a218bde4d2b9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-17T14:37:40+02:00

Commit Message:
DIRECTOR: Marked Win Warlock for testing too and make sure all games bear their status

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 8db7d72855..5d81867ae5 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -1154,12 +1154,6 @@ static const DirectorGameDescription gameDescriptions[] = {
 //
 //////////////////////////////////////////////////
 
-	MACGAME1("lzone", "",   "L-ZONE", 		"f5277c53bacd27936158dd3867e587e2", 392484, 300),
-	MACGAME1("lzone", "v2", "L-ZONE", 		"276bee761e48a6fd709df77d5c2f60dd", 395344, 300),
-	GENGAME1_("lzone", "",	"L-ZONE",		"9f0bb7ec7720e4f680ee3aa3d22c1c9d", 384968, Common::EN_ANY, Common::kPlatformMacintoshII,ADGF_MACRESFORK, 300),
-	WINGAME2("lzone", "",   "L_ZONE.EXE",	"65d06b5fef155a2473434571aff5bc29", 370009,
-						    "SYNER_01.MMM", "56b6f1c68e85a96bcdd01028bdec2d35", 460594, 300),
-
 #undef SUPPORT_STATUS
 #define SUPPORT_STATUS ADGF_UNSTABLE
 
@@ -1441,6 +1435,18 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	MACDEMO1_l("lotus123", "Tour", "Tour of 1-2-3.v3", "1ed38b71d8d0f075483117f7fa559e7c", 367333, Common::JA_JPN, 302),
 
+#undef SUPPORT_STATUS
+#define SUPPORT_STATUS ADGF_TESTING
+
+	MACGAME1("lzone", "",   "L-ZONE", 		"f5277c53bacd27936158dd3867e587e2", 392484, 300),
+	MACGAME1("lzone", "v2", "L-ZONE", 		"276bee761e48a6fd709df77d5c2f60dd", 395344, 300),
+	GENGAME1_("lzone", "",	"L-ZONE",		"9f0bb7ec7720e4f680ee3aa3d22c1c9d", 384968, Common::EN_ANY, Common::kPlatformMacintoshII,ADGF_MACRESFORK, 300),
+	WINGAME2("lzone", "",   "L_ZONE.EXE",	"65d06b5fef155a2473434571aff5bc29", 370009,
+						    "SYNER_01.MMM", "56b6f1c68e85a96bcdd01028bdec2d35", 460594, 300),
+
+#undef SUPPORT_STATUS
+#define SUPPORT_STATUS ADGF_UNSTABLE
+
 	// This may be a hybrid of media from Director, HyperCard, and Farallon MediaTracks
 	// Original filenames are MB.DemoMovie/C and MB.DemoMovie/M
 	MACDEMO1_l("macbasic", "Color Demo", "MB.DemoMovie-C", "7ed88097881eaf2ae4b05c9bf7efdc7c", 170579, Common::JA_JPN, 300),
@@ -1559,7 +1565,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("vwIntroOsmo", "910c6e4bf76294802e985e5b55994a73", 11374),
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			(ADGF_CD|ADGF_MACRESFORK),
+			(ADGF_CD|ADGF_MACRESFORK|SUPPORT_STATUS),
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,
@@ -1717,10 +1723,16 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME1_l("vvs", "", "VVS Theater-ExtraLarge", "f5277c53bacd27936158dd3867e587e2", 912907, Common::JA_JPN, 311),
 	MACDEMO1_l("vvs", "Demo", "VVS Theater", "f5277c53bacd27936158dd3867e587e2", 639768, Common::JA_JPN, 311),
 
+#undef SUPPORT_STATUS
+#define SUPPORT_STATUS ADGF_TESTING
+
 	WINGAME1("warlock", "", "SSWARLCK.EXE", "65d06b5fef155a2473434571aff5bc29", 370867, 300),
 	WINDEMO1("warlock", "Demo", "SSWDEMO.EXE", "65d06b5fef155a2473434571aff5bc29", 370934, 300),
 	MACDEMO1("warlock", "1994 Demo", "Spaceship Launch", "7f443f2e63fd497a9ad85b10dc880a91", 385872, 313),
 
+#undef SUPPORT_STATUS
+#define SUPPORT_STATUS ADGF_UNSTABLE
+
 	WINDEMO1("wep", "Demo", "WEP.EXE", "2b3543a9131a49f665982d26513a84f8", 1796465, 310),
 
 	// Original filename is WONDEROMPM4.5J Ver.2 サンプル
@@ -1750,7 +1762,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("Peanuts", "7f443f2e63fd497a9ad85b10dc880a91", 463942),
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
-			(ADGF_CD|ADGF_MACRESFORK),
+			(ADGF_CD|ADGF_MACRESFORK|SUPPORT_STATUS),
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,
@@ -2753,7 +2765,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("Maboroshi no tengu-chi", "792a89586ed20c4662b51c2bfd43be80", 1102407),
 			Common::JA_JPN,
 			Common::kPlatformMacintosh,
-			ADGF_CD | ADGF_DEMO,
+			ADGF_CD | ADGF_DEMO | SUPPORT_STATUS,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,
@@ -2936,7 +2948,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 					   "DPSHOT.DXR", "08b944be3cccdbbe3646fce08f2780f0", 1357970),
 			Common::EN_ANY,
 			Common::kPlatformWindows,
-			ADGF_CD,
+			ADGF_CD | SUPPORT_STATUS,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,
@@ -3242,7 +3254,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("BOAT95.EXE", "38b75ecdedf662326fe4931a68ae60cd", 1410860),
 			Common::JA_JPN,
 			Common::kPlatformWindows,
-			ADGF_DEMO | ADGF_CD,
+			ADGF_DEMO | ADGF_CD | SUPPORT_STATUS,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,


Commit: 6fc825a1c2d6d32e109e51e01e58775193b7c781
    https://github.com/scummvm/scummvm/commit/6fc825a1c2d6d32e109e51e01e58775193b7c781
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-17T14:37:40+02:00

Commit Message:
NEWS: Mention L-ZONE and Warlock support

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 1917ac4b7f..04a4457e4c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -24,6 +24,8 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Added support for Nightlong: Union City Conspiracy.
    - Added support for The Journeyman Project 2: Buried in Time.
    - Added support for Crusader: No Remorse.
+   - Added support for L-ZONE.
+   - Added support for Spaceship Warlock.
 
  New ports:
    - The Nintendo DS port got a major rewrite.


Commit: 7642ecf0a9a8bf2afbcb16d7ba10480cefb50c07
    https://github.com/scummvm/scummvm/commit/7642ecf0a9a8bf2afbcb16d7ba10480cefb50c07
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-17T14:37:40+02:00

Commit Message:
DEVTOOLS: Fix URL for create_classicmacfonts.sh

Changed paths:
    devtools/create_classicmacfonts.sh


diff --git a/devtools/create_classicmacfonts.sh b/devtools/create_classicmacfonts.sh
index 73ceca33a5..7373b99004 100755
--- a/devtools/create_classicmacfonts.sh
+++ b/devtools/create_classicmacfonts.sh
@@ -25,7 +25,7 @@ fi
 
 echo_n "Downloading System 7.0.1 image..."
 if test ! -f System_7.0.1.smi.bin; then
-	curl -s http://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Macintosh/System/Older_System/System_7.0.x/System_7.0.1.smi.bin -o System_7.0.1.smi.bin
+	curl -s https://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Macintosh/System/Older_System/System_7.0.x/System_7.0.1.smi.bin -o System_7.0.1.smi.bin
 fi
 
 if test ! -f System_7.0.1.smi.bin; then




More information about the Scummvm-git-logs mailing list