[Scummvm-git-logs] scummvm master -> 8f92cfa7d95052cdb27ac3c9b5a90e2acc7b319b

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
8f92cfa7d9 DIRECTOR: add MacJapanese pre-6 equality table


Commit: 8f92cfa7d95052cdb27ac3c9b5a90e2acc7b319b
    https://github.com/scummvm/scummvm/commit/8f92cfa7d95052cdb27ac3c9b5a90e2acc7b319b
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2026-02-10T20:59:32+01:00

Commit Message:
DIRECTOR: add MacJapanese pre-6 equality table

This adds a MacJapanese equality table for pre-D6 based on a table
generated by running the `D4-mac-equality-movie` test movie under
Director 4.0.4J. https://github.com/scummvm/director-tests/pull/3

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index d70139642ff..184a713f17f 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -1711,6 +1711,30 @@ const byte equalityTableD3mac[256] = {
 	0xf0, 0x4f, 0x55, 0x55, 0x55, 0x49, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
 };
 
+//
+// Director 3, 4, 5 Mac MacJapanese
+//
+
+const byte equalityTableD3macJa[256] = {
+	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+	0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+	0x80, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+	0xb0, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+	0xc0, 0xc1, 0xaf, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+	0xd0, 0xd1, 0xd2, 0xd3, 0xac, 0xad, 0xae, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xfd, 0xfe, 0xff
+};
+
+
 
 static int getCharOrder(Common::u32char_type_t ch) {
 	int num = charToNum(ch);
@@ -1776,6 +1800,9 @@ static int getCharEquality(Common::u32char_type_t ch) {
 	if (pl == Common::kPlatformMacintosh && lang != Common::JA_JPN && version < 600)
 		return equalityTableD3mac[num];
 
+	if (pl == Common::kPlatformMacintosh && lang == Common::JA_JPN && version < 600)
+		return equalityTableD3macJa[num];
+
 	if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version < 500)
 		return equalityTableD4win[num];