[Scummvm-git-logs] scummvm master -> 0e1a96346462ddd5982c9acb5addc29ce2427f87

[dwatteau]

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:
0e1a963464 SCUMM: LOOM (FM-Towns): Ignore trim_fmtowns_to_200_pixels setting (Trac#15666)


Commit: 0e1a96346462ddd5982c9acb5addc29ce2427f87
    https://github.com/scummvm/scummvm/commit/0e1a96346462ddd5982c9acb5addc29ce2427f87
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-01-13T19:18:21+01:00

Commit Message:
SCUMM: LOOM (FM-Towns): Ignore trim_fmtowns_to_200_pixels setting (Trac#15666)

`trim_fmtowns_to_200_pixels` support for Loom FM-Towns was not meant to
happen (see GH-2913 PR comments), and it has no TRIM_FMTOWNS_TO_200_PIXELS
game-option in its detection tables anyway.

But one could force this setting through the configuration file, hitting
the expected issues coming from the fact that Loom _does_ use the extra
40 pixels, in various places. See Trac#11290 and the original comments in
<https://forums.scummvm.org/viewtopic.php?p=97395#p97395> for more info.

So, unless someone wants to finish the original work to fix Loom with this
setting, we're going to ignore it for Loom, for now.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 937950cce49..74a2f776098 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -376,7 +376,10 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 
 	if (_game.platform == Common::kPlatformFMTowns && _game.version == 3) {
 		// FM-TOWNS V3 games originally use 320x240, and we have an option to trim to 200
-		if (!ConfMan.getBool("trim_fmtowns_to_200_pixels"))
+		// FIXME: Don't allow this for Loom yet, though; it used the extra 40 pixels for
+		// various things, and so this option currently causes various issues (see bugs
+		// #15666, #11290, and <https://forums.scummvm.org/viewtopic.php?p=97395#p97395>).
+		if (_game.id == GID_LOOM || !ConfMan.getBool("trim_fmtowns_to_200_pixels"))
 			_screenHeight = 240;
 	} else if (_game.version == 8 || _game.heversion >= 71) {
 		// COMI uses 640x480. Likewise starting from version 7.1, HE games use