[Scummvm-git-logs] scummvm master -> b1d193cc24c16d539fd045753594eece26f8c364

[sev-]

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:
b1d193cc24 DIRECTOR: Added D4J sorting table


Commit: b1d193cc24c16d539fd045753594eece26f8c364
    https://github.com/scummvm/scummvm/commit/b1d193cc24c16d539fd045753594eece26f8c364
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-11T16:24:00+01:00

Commit Message:
DIRECTOR: Added D4J sorting table

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index b22947156d9..4acd153c6d2 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -1176,6 +1176,38 @@ const byte orderTableD2mac[256] = {
 	0xf5, 0x8b, 0xa5, 0xa7, 0xa6, 0x77, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 };
 
+//
+// Director 4.0 Mac, MacJapanese encoding
+//
+// �...............................
+// ................................
+// ............................ !"#
+// $%&'()*+,-./0123456789:;<=>?@AaB
+// bCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqR
+// rSsTtUuVvWwXxYyZz[\]^_`{|}~.����
+// ��������������������������������
+// ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ó¬Ô­Õ®ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ü¦Ý ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½.
+
+
+const byte orderTableD4Jmac[256] = {
+	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, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
+	0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b,
+	0x7c, 0x7d, 0x7f, 0x81, 0x83, 0x85, 0x87, 0x89, 0x8b, 0x8d, 0x8f, 0x91, 0x93, 0x95, 0x97, 0x99,
+	0x9b, 0x9d, 0x9f, 0xa1, 0xa3, 0xa5, 0xa7, 0xa9, 0xab, 0xad, 0xaf, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5,
+	0xb6, 0x7e, 0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x96, 0x98, 0x9a,
+	0x9c, 0x9e, 0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae, 0xb0, 0xb7, 0xb8, 0xb9, 0xba, 0xbb,
+	0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xf3, 0xbe, 0xc0, 0xc2, 0xc4, 0xc6, 0xe7, 0xe9, 0xeb, 0xd4,
+	0xbd, 0xbf, 0xc1, 0xc3, 0xc5, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1,
+	0xd2, 0xd3, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2,
+	0xe3, 0xe4, 0xe5, 0xe6, 0xe8, 0xea, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf4, 0xfb, 0xfc,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfe, 0xff,
+};
+
 //
 // Director 4.0-5.0 Win, cp1250 encoding
 //
@@ -1252,6 +1284,9 @@ static int getCharOrder(Common::u32char_type_t ch) {
 	if (pl == Common::kPlatformMacintosh && lang != Common::JA_JPN && version < 500)
 		return orderTableD2mac[num];
 
+	if (pl == Common::kPlatformMacintosh && lang == Common::JA_JPN && version < 500)
+		return orderTableD4Jmac[num];
+
 	if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version < 600)
 		return orderTableD4win[num];