[Scummvm-git-logs] scummvm master -> 685f6f8399d4fbf2a335e06ba980b5508d4b9d48

[athrxx]

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:
685f6f8399 SCUMM: experimental fix for bug no. 15143


Commit: 685f6f8399d4fbf2a335e06ba980b5508d4b9d48
    https://github.com/scummvm/scummvm/commit/685f6f8399d4fbf2a335e06ba980b5508d4b9d48
Author: athrxx (athrxx at scummvm.org)
Date: 2024-05-29T21:16:52+02:00

Commit Message:
SCUMM: experimental fix for bug no. 15143

Changed paths:
    engines/scumm/detection_internal.h


diff --git a/engines/scumm/detection_internal.h b/engines/scumm/detection_internal.h
index 576e07de96c..ce1a215dbf5 100644
--- a/engines/scumm/detection_internal.h
+++ b/engines/scumm/detection_internal.h
@@ -860,7 +860,19 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com
 }
 
 static Common::String customizeGuiOptions(const DetectorResult &res) {
-	Common::String guiOptions = res.game.guioptions + MidiDriver::musicType2GUIO(res.game.midi);
+	Common::String guiOptions = res.game.guioptions;
+
+	static const uint mtypes[] = { MT_PCSPK, MT_CMS, MT_PCJR, MT_ADLIB, MT_C64, MT_AMIGA, MT_APPLEIIGS, MT_TOWNS, MT_PC98, MT_SEGACD };
+
+	for (int i = 0; i < ARRAYSIZE(mtypes); ++i) {
+		if (res.game.midi & (1 << i))
+			guiOptions += MidiDriver::musicType2GUIO(mtypes[i]);
+	}
+	if (res.game.midi & MDT_MIDI) {
+		guiOptions += MidiDriver::musicType2GUIO(MT_GM);
+		guiOptions += MidiDriver::musicType2GUIO(MT_MT32);
+	}
+	
 	Common::String defaultRenderOption = "";
 
 	// Add default rendermode option for target. We don't put the default mode into the