[Scummvm-git-logs] scummvm master -> 468a79aee61ad789f57f59855f0926843fb8e0f2

[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:
468a79aee6 SCUMM: Make the Monkey1 FM-TOWNS verb rendering fix an enhancement (Trac#13735)


Commit: 468a79aee61ad789f57f59855f0926843fb8e0f2
    https://github.com/scummvm/scummvm/commit/468a79aee61ad789f57f59855f0926843fb8e0f2
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-09-15T09:58:39+02:00

Commit Message:
SCUMM: Make the Monkey1 FM-TOWNS verb rendering fix an enhancement (Trac#13735)

The original FM-TOWNS interpreter had a bug which made the verb font
much thinner than in the other releases (it was missing its "3D"
effect).

Some people may prefer seeing the original behavior, others prefer
having original game bugs fixed, so `_enableEnhancements` solves the
personal taste matter.

Was discussed here:
https://github.com/scummvm/scummvm/commit/4248e22cbfc54c36dcc17f4d3912a5fb30a5dbc2#commitcomment-80191288

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 8243c2d0db9..268dedb6b96 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -883,13 +883,14 @@ void ScummEngine_v5::o5_cursorCommand() {
 			// games if needed.
 		} else {
 			getWordVararg(table);
+			// WORKAROUND bug #13735 - "Inaccurate verb rendering in Monkey 1 FM-TOWNS"
 			// MI1 FM-Towns has a bug in the original interpreter which removes the shadow color from the verbs.
 			// getWordVararg() will generate a WORD table, but then - right here - it is accessed like a DWORD
 			// table. This is actually fixed in the original interpreters for MI2 and INDY4. It could be argued
-			// if we even want that "fixed", but it does lead to bug tickets (#13735 - "Inaccurate verb rendering
-			// in Monkey 1 FM-TOWNS") and the "fix" restores the original appearance (which - as per usual - is
-			// a matter of personal taste...)
-			int m = (_game.platform == Common::kPlatformFMTowns && _game.id == GID_MONKEY) ? 2 : 1;
+			// if we even want that "fixed", but it does lead to bug tickets in Monkey 1 FM-TOWNS") and the
+			// "fix" restores the original appearance (which - as per usual - is a matter of personal taste...).
+			// So let people make their own choice with the Enhancement setting.
+			int m = (_game.platform == Common::kPlatformFMTowns && _game.id == GID_MONKEY && !_enableEnhancements) ? 2 : 1;
 			for (i = 0; i < 16; i++)
 				_charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)table[i * m];
 		}