[Scummvm-git-logs] scummvm master -> 9534005b6fe24f9538321558cb73b22a4f477357

[bluegr]

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

Summary:
9534005b6f SCI: Rename "Hoyle School House Math" to "Hoyle School House"


Commit: 9534005b6fe24f9538321558cb73b22a4f477357
    https://github.com/scummvm/scummvm/commit/9534005b6fe24f9538321558cb73b22a4f477357
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2026-09-25T09:37:33+03:00

Commit Message:
SCI: Rename "Hoyle School House Math" to "Hoyle School House"

I have verified that all three Sierra's School House (Math, Science, and
English) all have the exact same version of Hoyle. In fact, the whole
first CD is virtually identical on the three, except for some
installation and boot disk stuff. The differences are on the second CD,
which I assume is the main game.

Changed paths:
    engines/sci/detection.cpp
    engines/sci/engine/features.cpp
    engines/sci/engine/script_patches.cpp
    engines/sci/graphics/frameout.cpp


diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 9830ce28c38..90db011fb42 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -138,7 +138,7 @@ static const PlainGameDescriptor s_sciGameTitles[] = {
 	{"hoyle5",          "Hoyle Classic Games"},
 	{"hoyle5bridge",    "Hoyle Bridge"},
 	{"hoyle5children",  "Hoyle Children's Collection"},
-	{"hoyle5school",    "Hoyle School House Math"},
+	{"hoyle5school",    "Hoyle School House"},
 	{"hoyle5solitaire", "Hoyle Solitaire"},
 	{"chest",           "Inside the Chest"},	// aka Behind the Developer's Shield
 	{"gk2",             "The Beast Within: A Gabriel Knight Mystery"},
diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp
index e113293e59e..1e7948083cf 100644
--- a/engines/sci/engine/features.cpp
+++ b/engines/sci/engine/features.cpp
@@ -598,7 +598,7 @@ bool GameFeatures::audioVolumeSyncUsesGlobals() const {
 	case GID_TORIN:
 		return true;
 	case GID_HOYLE5:
-		// Hoyle school house math does not use a volume global
+		// Hoyle school house does not use a volume global
 		return !g_sci->getResMan()->testResource(ResourceId(kResourceTypeView, 21));
 	default:
 		return false;
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 3598519f936..7d9fe3f0dd7 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2978,7 +2978,7 @@ static const uint16 hoyle5PatchDisableGame[] = {
 	PATCH_END
 };
 
-// Hoyle School House Math is similar to the Children's Collection and Bridge
+// Hoyle School House is similar to the Children's Collection and Bridge
 //  versions above, where the individual card games were launched externally
 //  by passing a config file to the interpreter. The menus for this game are
 //  present, although they are still using Hoyle4 graphics, but they are missing
@@ -27279,7 +27279,7 @@ void ScriptPatcher::processScript(uint16 scriptNr, SciSpan<byte> scriptData) {
 				break;
 			case GID_HOYLE5:
 				if (g_sci->getResMan()->testResource(ResourceId(kResourceTypeView, 21))) {
-					// Hoyle school house math
+					// Hoyle school house
 					enablePatch(signatureTable, "disable sierra logo");
 					enablePatch(signatureTable, "disable main menu buttons");
 					enablePatch(signatureTable, "disable Euchre and Bridge");
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index cb7fe4e4078..bd640ae9c3f 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -84,7 +84,7 @@ GfxFrameout::GfxFrameout(SegManager *segMan, GfxPalette32 *palette, GfxTransitio
 	switch (g_sci->getGameId()) {
 	case GID_HOYLE5:
 		if (g_sci->getResMan()->testResource(ResourceId(kResourceTypeView, 21))) {
-			// Hoyle school house math
+			// Hoyle school house
 			_scriptWidth = 320;
 			_scriptHeight = 200;
 			break;