[Scummvm-git-logs] scummvm master -> 868f17c85d0aa62aa0b73f77730d04c152e2d8ac

[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:
868f17c85d SCUMM: (Amiga) - remove unwanted render modes in launcher


Commit: 868f17c85d0aa62aa0b73f77730d04c152e2d8ac
    https://github.com/scummvm/scummvm/commit/868f17c85d0aa62aa0b73f77730d04c152e2d8ac
Author: athrxx (athrxx at scummvm.org)
Date: 2024-05-30T22:03:55+02:00

Commit Message:
SCUMM: (Amiga) - remove unwanted render modes in launcher

Changed paths:
    engines/scumm/detection_internal.h


diff --git a/engines/scumm/detection_internal.h b/engines/scumm/detection_internal.h
index ca4c2f46404..f311347ff55 100644
--- a/engines/scumm/detection_internal.h
+++ b/engines/scumm/detection_internal.h
@@ -880,6 +880,17 @@ static Common::String customizeGuiOptions(const DetectorResult &res) {
 		guiOptions += MidiDriver::musicType2GUIO(MT_GM);
 		guiOptions += MidiDriver::musicType2GUIO(MT_MT32);
 	}
+
+	// Amiga versions often have no detection entries of their own and therefore come with all the DOS render modes.
+	// We remove them if we find any.
+	static const char *const rmodes[] = { GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGABW, GUIO_RENDERCGACOMP, GUIO_RENDERCGA };
+	if (res.game.platform == Common::kPlatformAmiga) {
+		for (int i = 0; i < ARRAYSIZE(rmodes); ++i) {
+			uint pos = guiOptions.findFirstOf(rmodes[i][0]);
+			if (pos != Common::String::npos)
+				guiOptions.erase(pos, 1);
+		}
+	}
 	
 	Common::String defaultRenderOption = "";
 	Common::String defaultSoundOption = "";