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

[AndywinXp]

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:
0e287edb17 SCUMM: v1: Fix apostrophe character rendering


Commit: 0e287edb17208a5a9d2ebd1f38495344cd3bf967
    https://github.com/scummvm/scummvm/commit/0e287edb17208a5a9d2ebd1f38495344cd3bf967
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-08-05T22:51:15+02:00

Commit Message:
SCUMM: v1: Fix apostrophe character rendering

Changed paths:
    engines/scumm/charset-fontdata.cpp


diff --git a/engines/scumm/charset-fontdata.cpp b/engines/scumm/charset-fontdata.cpp
index 3794c122cd2..f9c84c90654 100644
--- a/engines/scumm/charset-fontdata.cpp
+++ b/engines/scumm/charset-fontdata.cpp
@@ -405,6 +405,14 @@ static const byte russianCharsetDataV2[] = {
 // These replacement character tables have been created using the
 // make-charset-fontdata tool.
 
+// English v1 Zak font with inverted apostrophe.
+// The original interpreter apparently manipulates the character on
+// the fly and kind of mirrors it; we instead opt for a substitution.
+static const byte englishCharsetDataV1[] = {
+	39,
+	2,
+};
+
 // German Zak font.
 static const byte germanCharsetDataV2[] = {
 	36, 0,
@@ -696,7 +704,13 @@ CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
 		replacementData = hebrewCharsetDataV2;
 		break;
 	default:
-		_fontPtr = englishCharsetDataV2;
+		if (_vm->_game.version == 1 && !(_vm->_game.features & GF_DEMO)) {
+			replacementMap = englishCharsetDataV1;
+			replacementChars = sizeof(englishCharsetDataV1) / 2;
+			replacementData = specialCharsetData;
+		} else {
+			_fontPtr = englishCharsetDataV2;
+		}
 		break;
 	}