[Scummvm-git-logs] scummvm master -> 0151b1ad7dc3f0bcd48550f0c643c38e52a074d9

[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:
0151b1ad7d GROOVIE: add detection for T11H German and TLC DVD


Commit: 0151b1ad7dc3f0bcd48550f0c643c38e52a074d9
    https://github.com/scummvm/scummvm/commit/0151b1ad7dc3f0bcd48550f0c643c38e52a074d9
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-01-09T15:51:47-06:00

Commit Message:
GROOVIE: add detection for T11H German and TLC DVD

also fixed ScummVM save/load for T11H alternate languages

TLC DVD is the version Liron owns, unknown what the difference is to eriktorbjorn's version

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


diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 1a1e99f015e..ec0f0406c17 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -145,6 +145,18 @@ static const GroovieGameDescription gameDescriptions[] = {
 		kGroovieT11H
 	},
 
+	// The 11th Hour DOS/Windows German
+	{
+		{
+			"11h", "",
+			AD_ENTRY2s("script.grv", "560e90b47054639668e44a8b365fbe26", 62447,
+						"introd1.gjd", nullptr, -1),
+			Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE,
+			GUIO7(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_NOASPECT, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_EASIER_AI, GAMEOPTION_FINAL_HOUR)
+		},
+		kGroovieT11H
+	},
+
 	// The 11th Hour Mac English
 	{
 		{
@@ -337,7 +349,7 @@ static const GroovieGameDescription gameDescriptions[] = {
 		kGroovieTLC
 	},
 
-	// Tender Loving Care PC English (DVD-ROM)
+	// Tender Loving Care PC English (DVD-ROM) (eriktorbjorn's copy)
 	{
 		{
 			"tlc", "DVD",
@@ -349,6 +361,18 @@ static const GroovieGameDescription gameDescriptions[] = {
 		kGroovieTLC
 	},
 
+	// Tender Loving Care PC English (DVD-ROM) (Liron's copy)
+	{
+		{
+			"tlc", "DVD",
+			AD_ENTRY2s("tlcmain.grv", "8a591c47d24dde38615e6ea2e79b51a5", 17375,
+						"tlcnav.gjd", nullptr, -1),
+			Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE,
+			GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)
+		},
+		kGroovieTLC
+	},
+
 	// Tender Loving Care PC Demo German https://archive.org/details/Tender_Loving_Care_demo
 	{
 		{
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 612cd626132..3c0f9d1a191 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -2077,13 +2077,15 @@ void Script::o2_setbackgroundsong() {
 void Script::o2_videofromref() {
 	uint32 fileref = readScript32bits();
 
+	// the fileref differs between languages, but the instruction pointers and script sizes are the same
+
 	// 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 && fileref == 4926 && fileref != _videoRef)
+	if (_version == kGroovieT11H && _currentInstruction == 0x0560 && fileref != _videoRef)
 		_videoSkipAddress = 1417;
 
-	if (_version == kGroovieT11H && fileref == 4337 && !ConfMan.getBool("originalsaveload")) {
+	if (_version == kGroovieT11H && fileref != _videoRef && !ConfMan.getBool("originalsaveload")) {
 		if (_currentInstruction == 0xE50A) {
 			// Load from the main menu
 			GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);