[Scummvm-git-logs] scummvm master -> 157af3c22aca997ab7b449e61be4028c3bdd9e03

[Die4Ever]

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

Summary:
157af3c22a GROOVIE: support for T11H Souped Up


Commit: 157af3c22aca997ab7b449e61be4028c3bdd9e03
    https://github.com/scummvm/scummvm/commit/157af3c22aca997ab7b449e61be4028c3bdd9e03
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-10-07T16:43:32-05:00

Commit Message:
GROOVIE: support for T11H Souped Up

Changed paths:
    engines/groovie/detection.cpp
    engines/groovie/script.cpp


diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 15a8ee0ab1e..ee75866ca0c 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -53,6 +53,7 @@ static const PlainGameDescriptor groovieGames[] = {
 	// Games
 	{"t7g", "The 7th Guest"},
 	{"11h", "The 11th Hour: The Sequel to The 7th Guest"},
+	{"11hsu", "The 11th Hour: Souped Up"},
 	{"making11h", "The Making of The 11th Hour"},
 	{"clandestiny", "Clandestiny"},
 	{"unclehenry", "Uncle Henry's Playhouse"},
@@ -63,14 +64,25 @@ static const PlainGameDescriptor groovieGames[] = {
 const int BASE_FLAGS = ADGF_NO_FLAGS;
 
 #define GROOVIEGAME(id, extra, f1, x1, s1, f2, x2, s2, language, platform, flags, guiOptions, version) \
-	{																							\
-		{																				\
-			id, extra,																	\
-			AD_ENTRY2s(f1, x1, s1, f2, x2, s2),											\
-			language, platform, (flags),												\
-			(guiOptions)																\
-		},																				\
-		version																			\
+	{                                                                                                  \
+		{                                                                                              \
+			id, extra,                                                                                 \
+			AD_ENTRY2s(f1, x1, s1, f2, x2, s2),                                                        \
+			language, platform, (flags),                                                               \
+			(guiOptions)                                                                               \
+		},                                                                                             \
+			version                                                                                    \
+	}
+
+#define T11HSUENTRY(extra, f1, x1, s1, f2, x2, s2, language, platform, flags, guiOptions, version)     \
+	{                                                                                                  \
+		{                                                                                              \
+			"11hsu", extra,                                                                            \
+			AD_ENTRY3s("suscript.grv", NULL, -1, f1, x1, s1, f2, x2, s2),                              \
+			language, platform, (flags),                                                               \
+			(guiOptions)                                                                               \
+		},                                                                                             \
+			version                                                                                    \
 	}
 
 
@@ -81,7 +93,8 @@ const int BASE_FLAGS = ADGF_NO_FLAGS;
 	GROOVIEGAME("t7g", extra, f1, x1, s1, f2, x2, s2, language, platform, flags, (GUIO_NOMIDI GUIO_NOASPECT GUIO_NOSFX GAMEOPTION_T7G_FAST_MOVIE_SPEED GAMEOPTION_SPEEDRUN guiOptions), kGroovieT7G)
 
 #define T11HENTRY(extra, f1, x1, s1, f2, x2, s2, language, platform, flags) \
-	GROOVIEGAME("11h", extra, f1, x1, s1, f2, x2, s2, language, platform, flags, GUIO7(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM GUIO_NOASPECT, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_EASIER_AI, GAMEOPTION_FINAL_HOUR, GAMEOPTION_SPEEDRUN), kGroovieT11H)
+	GROOVIEGAME("11h", extra, f1, x1, s1, f2, x2, s2, language, platform, flags, GUIO7(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM GUIO_NOASPECT, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_EASIER_AI, GAMEOPTION_FINAL_HOUR, GAMEOPTION_SPEEDRUN), kGroovieT11H), \
+	T11HSUENTRY(extra, f1, x1, s1, f2, x2, s2, language, platform, flags, GUIO6(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM GUIO_NOASPECT, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_EASIER_AI, GAMEOPTION_SPEEDRUN), kGroovieT11H)
 
 #define T11HDEMOENTRY(extra, f1, x1, s1, f2, x2, s2, language, platform, flags) \
 	GROOVIEGAME("11h", extra, f1, x1, s1, f2, x2, s2, language, platform, flags | ADGF_DEMO, GUIO6(GUIO_NOLAUNCHLOAD, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_NOASPECT, GAMEOPTION_SPEEDRUN), kGroovieT11H)
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index c92dfad7319..9616c67ec9a 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -2193,7 +2193,7 @@ void Script::o2_videofromref() {
 	// Skip the 11th Hour intro videos on right mouse click, instead of
 	// fast-forwarding them. This has the same effect as pressing 'p' twice in
 	// the skulls screen after the Groovie logo
-	if (_version == kGroovieT11H && _currentInstruction == 0x0560 && fileref != _videoRef)
+	if (_version == kGroovieT11H && _currentInstruction == 0x0560 && fileref != _videoRef && _scriptFile == "script.grv")
 		_videoSkipAddress = 1417;
 
 	if (_version == kGroovieT11H && fileref != _videoRef && !ConfMan.getBool("originalsaveload")) {