[Scummvm-git-logs] scummvm master -> 79aede154b92e8f977e9a81388a4fb835904ef40

[lotharsm]

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:
7acd0b7900 DIRECTOR: Add detection for Tivola Demo - Herbst 1998
79aede154b DIRECTOR: Avoid duplicate detection matches for Tivola samplers


Commit: 7acd0b790030074901741e58630f9ab58eecc9d5
    https://github.com/scummvm/scummvm/commit/7acd0b790030074901741e58630f9ab58eecc9d5
Author: Lothar Serra Mari (mail at serra.me)
Date: 2024-01-08T20:02:07+01:00

Commit Message:
DIRECTOR: Add detection for Tivola Demo - Herbst 1998

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 2f1e33f3252..fe085911ab2 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -1518,6 +1518,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "sfk",				"Science for Kids Product Demos" },
 	{ "sonywalkman",		"Sony Walkman PRD-155SB / PRD-150" },
 	{ "techiescom",			"techies.com Business Card" },
+	{ "tivolafall1998",		"Tivola Demo - Herbst 1998" },   // Contains D4, D5 and D6 executables
 	{ "tivolaspring1999",	"Tivola Demo - Frühling 1999" }, // Contains D4, D5 and D6 executables
 	{ "tivolasummer2000",	"Tivola Demo - Sommer 2000" },
 	{ "tlc",				"The Learning Company Sampler" },
@@ -7824,6 +7825,12 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	WINGAME1("thesims", "", "maxis.exe", "d62438566e44826960fc16c5c23dbe43", 1915533, 650),
 
+	// Tivola demo/sampler disc, Fall 1998, released in Germany
+	MACGAME2f_l("tivolafall1998", "Sampler", "Start",        "r:d549c6d331cf1c6354f1f2b93b34c0f4", 1026645,
+											 "Selector.dxr", "d:a2a7e250ea2b6e16467662454bd90381", 8035090, Common::DE_DEU, 601, GF_32BPP),
+	WINGAME2f_l("tivolafall1998", "Sampler", "START16.EXE",  "t:a7fbc5507e75ea320562965671db3e0d", 1396929,
+											 "SELECTOR.DXR", "d:a2a7e250ea2b6e16467662454bd90381", 8035090, Common::DE_DEU, 601, GF_32BPP),
+
 	// Tivola demo/sampler disc, Spring 1999, released in Germany
 	MACGAME2f_l("tivolaspring1999", "Sampler",	  "Start",       "r:34be958e28922244011f9f0be46c5b57", 1030506,
 												  "Intro.dxr",   "d:fc34f90b4cf6e2b205414d6165dae050", 1302996, Common::DE_DEU, 601, GF_32BPP),


Commit: 79aede154b92e8f977e9a81388a4fb835904ef40
    https://github.com/scummvm/scummvm/commit/79aede154b92e8f977e9a81388a4fb835904ef40
Author: Lothar Serra Mari (mail at serra.me)
Date: 2024-01-08T20:07:39+01:00

Commit Message:
DIRECTOR: Avoid duplicate detection matches for Tivola samplers

Changed paths:
    engines/director/detection_tables.h
    engines/director/lingo/xlibs/findwin.cpp


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index fe085911ab2..82ab9e7b6ad 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -7832,10 +7832,10 @@ static const DirectorGameDescription gameDescriptions[] = {
 											 "SELECTOR.DXR", "d:a2a7e250ea2b6e16467662454bd90381", 8035090, Common::DE_DEU, 601, GF_32BPP),
 
 	// Tivola demo/sampler disc, Spring 1999, released in Germany
-	MACGAME2f_l("tivolaspring1999", "Sampler",	  "Start",       "r:34be958e28922244011f9f0be46c5b57", 1030506,
-												  "Intro.dxr",   "d:fc34f90b4cf6e2b205414d6165dae050", 1302996, Common::DE_DEU, 601, GF_32BPP),
-	WINGAME2f_l("tivolaspring1999", "Sampler",	  "START16.EXE", "t:a7fbc5507e75ea320562965671db3e0d", 1396929,
-												  "INTRO.DXR",   "d:fc34f90b4cf6e2b205414d6165dae050", 1302996, Common::DE_DEU, 601, GF_32BPP),
+	MACGAME2f_l("tivolaspring1999", "Sampler", "Start",        "r:34be958e28922244011f9f0be46c5b57", 1030506,
+											   "Selector.dxr", "d:85d85c2e1c2d74166548f222cc77918f", 10601412, Common::DE_DEU, 601, GF_32BPP),
+	WINGAME2f_l("tivolaspring1999", "Sampler", "START16.EXE",  "t:a7fbc5507e75ea320562965671db3e0d", 1396929,
+											   "SELECTOR.DXR", "d:89408b76c6835b4e813f375371ebfd1b", 10979868, Common::DE_DEU, 601, GF_32BPP),
 
 	// Tivola demo/sampler disc, Summer 2000, released in Germany
 	MACGAME2_l("tivolasummer2000", "Sampler", "Start",       "r:4f9ad1f256e6840067f44a1c9ad80233", 1031458,
diff --git a/engines/director/lingo/xlibs/findwin.cpp b/engines/director/lingo/xlibs/findwin.cpp
index ba1d3691b25..af8b085cf7c 100644
--- a/engines/director/lingo/xlibs/findwin.cpp
+++ b/engines/director/lingo/xlibs/findwin.cpp
@@ -22,6 +22,7 @@
 /*************************************
  *
  * USED IN:
+ * tivolafall1998
  * tivolaspring1999
  *
  *************************************/