[Scummvm-git-logs] scummvm master -> 68939befcb960016ef87d8aff2f2dda318a711ac

sev- noreply at scummvm.org
Wed May 17 18:36:14 UTC 2023 

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

Summary:
04153f915a DIRECTOR: Add order tables for D8.5+ (Win) and D8.5 (Mac)
68939befcb DIRECTOR: cp1250 -> cp1252 in order table comments


Commit: 04153f915adbf13953bd01bf585b3be0a7506622
    https://github.com/scummvm/scummvm/commit/04153f915adbf13953bd01bf585b3be0a7506622
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-05-17T20:36:10+02:00

Commit Message:
DIRECTOR: Add order tables for D8.5+ (Win) and D8.5 (Mac)

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index ba7e385059b..bd5237713b8 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -1364,6 +1364,54 @@ const byte orderTableD6win[256] = {
 	0x9c, 0xc3, 0xca, 0xc8, 0xcc, 0xd0, 0xce, 0x60, 0xd2, 0xea, 0xe8, 0xec, 0xee, 0xf8, 0xe3, 0xfa,
 };
 
+
+//
+// Director 8.5 Mac, MacRoman encoding
+//
+
+const byte orderTableD8mac[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, 0x22, 0x23, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 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, 0x58, 0x5a, 0x5e, 0x60, 0x6a, 0x6e, 0x70, 0x72, 0x7d, 0x7f, 0x81, 0x83, 0x85, 0x89,
+	0x99, 0x9b, 0x9d, 0x9f, 0xa2, 0xa4, 0xae, 0xb0, 0xb2, 0xb4, 0xb8, 0xba, 0xbb, 0xbc, 0xbd, 0xbe,
+	0xbf, 0x4f, 0x59, 0x5c, 0x5f, 0x65, 0x6b, 0x6f, 0x71, 0x77, 0x7e, 0x80, 0x82, 0x84, 0x87, 0x90,
+	0x9a, 0x9c, 0x9e, 0xa0, 0xa3, 0xa9, 0xaf, 0xb1, 0xb3, 0xb5, 0xb9, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4,
+	0x4c, 0x4e, 0x5b, 0x61, 0x86, 0x8d, 0xa8, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x5d, 0x66, 0x67,
+	0x68, 0x69, 0x79, 0x7a, 0x7b, 0x7c, 0x88, 0x91, 0x92, 0x93, 0x94, 0x95, 0xaa, 0xab, 0xac, 0xad,
+	0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xa1, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0x56, 0x8f,
+	0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0x57, 0x96,
+	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0x24, 0x25, 0xe7, 0x21, 0x4a, 0x4d, 0x8e, 0x97, 0x98,
+	0xe8, 0xe9, 0x26, 0x27, 0x2d, 0x2e, 0xea, 0xeb, 0xb6, 0xb7, 0xec, 0xed, 0xee, 0xef, 0x6c, 0x6d,
+	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0x4b, 0x63, 0x49, 0x64, 0x62, 0x73, 0x75, 0x76, 0x74, 0x8a, 0x8c,
+	0xf5, 0x8b, 0xa5, 0xa7, 0xa6, 0x77, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+};
+
+
+//
+// Director 8.5-10 Win, cp1250 encoding
+//
+
+const byte orderTableD8win[256] = {
+	0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x23, 0x24, 0x25, 0x26, 0x27, 0x0a, 0x0b,
+	0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b,
+	0x21, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x1d, 0x2e, 0x2f, 0x30, 0x58, 0x31, 0x1e, 0x32, 0x33,
+	0x73, 0x77, 0x79, 0x7b, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x34, 0x35, 0x59, 0x5a, 0x5b, 0x36,
+	0x37, 0x84, 0x95, 0x97, 0x9b, 0x9f, 0xa9, 0xac, 0xae, 0xb0, 0xba, 0xbc, 0xbe, 0xc0, 0xc2, 0xc6,
+	0xd7, 0xd9, 0xdb, 0xdd, 0xe2, 0xe7, 0xf1, 0xf3, 0xf5, 0xf7, 0xfd, 0x38, 0x39, 0x3a, 0x3b, 0x3d,
+	0x3e, 0x83, 0x94, 0x96, 0x9a, 0x9e, 0xa8, 0xab, 0xad, 0xaf, 0xb9, 0xbb, 0xbd, 0xbf, 0xc1, 0xc5,
+	0xd6, 0xd8, 0xda, 0xdc, 0xe1, 0xe6, 0xf0, 0xf2, 0xf4, 0xf6, 0xfc, 0x3f, 0x40, 0x41, 0x42, 0x1c,
+	0x57, 0x6e, 0x4d, 0xaa, 0x50, 0x69, 0x6a, 0x6b, 0x3b, 0x6d, 0xdf, 0x51, 0xd5, 0x6f, 0xff, 0x70,
+	0x71, 0x4b, 0x4c, 0x4e, 0x4f, 0x6c, 0x1f, 0x20, 0x4a, 0xe5, 0xde, 0x52, 0xd4, 0x72, 0xfe, 0xfb,
+	0x22, 0x43, 0x53, 0x54, 0x55, 0x56, 0x44, 0x61, 0x45, 0x62, 0x85, 0x5d, 0x63, 0x00, 0x64, 0x46,
+	0x65, 0x5c, 0x7a, 0x7c, 0x47, 0x66, 0x67, 0x68, 0x48, 0x78, 0xc7, 0x5e, 0x74, 0x75, 0x76, 0x49,
+	0x89, 0x87, 0x8b, 0x8f, 0x8d, 0x91, 0x93, 0x99, 0xa3, 0xa1, 0xa5, 0xa7, 0xb4, 0xb2, 0xb6, 0xb8,
+	0x9d, 0xc4, 0xcb, 0xc9, 0xcd, 0xd1, 0xcf, 0x5f, 0xd3, 0xeb, 0xe9, 0xed, 0xef, 0xf9, 0xe4, 0xe0,
+	0x88, 0x86, 0x8a, 0x8e, 0x8c, 0x90, 0x92, 0x98, 0xa2, 0xa0, 0xa4, 0xa6, 0xb3, 0xb1, 0xb5, 0xb7,
+	0x9c, 0xc3, 0xca, 0xc8, 0xcc, 0xd0, 0xce, 0x60, 0xd2, 0xea, 0xe8, 0xec, 0xee, 0xf8, 0xe3, 0xfa,
+};
+
 static int getCharOrder(Common::u32char_type_t ch) {
 	int num = charToNum(ch);
 
@@ -1386,6 +1434,15 @@ static int getCharOrder(Common::u32char_type_t ch) {
 	if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version < 700)
 		return orderTableD6win[num];
 
+	if (pl == Common::kPlatformMacintosh && lang != Common::JA_JPN && version < 900)
+		return orderTableD8mac[num];
+
+	if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version < 1100)
+		return orderTableD8win[num];
+
+	if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version >= 1100)
+		return num;
+
 	return num;
 }
 


Commit: 68939befcb960016ef87d8aff2f2dda318a711ac
    https://github.com/scummvm/scummvm/commit/68939befcb960016ef87d8aff2f2dda318a711ac
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-05-17T20:36:10+02:00

Commit Message:
DIRECTOR: cp1250 -> cp1252 in order table comments

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index bd5237713b8..0bcbe5c3e48 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -290,14 +290,14 @@ void DirectorEngine::loadKeyCodes() {
 
 void DirectorEngine::setMachineType(int machineType) {
     _machineType = machineType;
-    
+
     switch (machineType) {
     case 1: // Macintosh 512Ke
     case 2: // Macintosh Plus
     case 3: // Macintosh SE
     case 4: // Macintosh II
     case 5: // Macintosh IIx
-    case 6: // Macintosh IIcx 
+    case 6: // Macintosh IIcx
     case 7: // Macintosh SE/30
     case 8: // Macintosh Portable
     case 9: // Macintosh IIci
@@ -1302,16 +1302,16 @@ const byte orderTableD4Jmac[256] = {
 };
 
 //
-// Director 4.0-5.0 Win, cp1250 encoding
+// Director 4.0-5.0 Win, cp1252 encoding
 //
 // ................................
 //   !"«»#$%&'‘’()*+,-./0123456789:
-// ;<=>?@AÁŔÂÄĂĹĆaáŕâäăĺćBbCÇcçDĐdđ
-// EÉČĘËeéčęëFfGgHhIÍĚÎĎiíěîďJjKkLl
-// MmNŃnńOÓŇÔÖŐŘŚoóňôöőřśPpQqRrSŠsš
-// ßTtUÚŮŰÜuúůűüVvWwXxYÝźyý.Zz[\]^_
-// `{|}~.€�‚�„…†‡�‰‹ŤŽŹ�“”•–—�™›ťžˇ
-// ˘Ł¤Ą¦§¨©Ş¬®Ż°±˛ł´µ¶·¸ąşĽ˝ľż×Ţţ÷
+// ;<=>?@AÁÀÂÄÃÅÆaáàâäãåæBbCÇcçDÐdð
+// EÉÈÊËeéèêëFfGgHhIÍÌÎÏiíìîïJjKkLl
+// MmNÑnñOÓÒÔÖÕØŒoóòôöõøœPpQqRrSŠsš
+// ßTtUÚÙÛÜuúùûüVvWwXxYÝŸyý.Zz[\]^_
+// `{|}~.€�‚ƒ„…†‡ˆ‰‹�Ž��“”•–—˜™›�ž¡
+// ¢£¤¥¦§¨©ª¬­®¯°±²³´µ¶·¸¹º¼½¾¿×Þþ÷
 
 const byte orderTableD4win[256] = {
 	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
@@ -1334,16 +1334,16 @@ const byte orderTableD4win[256] = {
 
 
 //
-// Director 6.0 Win, cp1250 encoding
+// Director 6.0 Win, cp1252 encoding
 //
-// ............................�ŤŹ�
-// ť'-–—  .....!"#$%&()*,./:;?@[\]
-// ^�_`{|}~ˇ¦¨Ż´¸ż�‘’‚“”„‹›+<=>±«»×
-// ÷˘Ł¤Ą§©¬®°µ¶·†‡•…‰€0Ľ˝ľ1ą2˛3ł456
-// 789aAŞáÁŕŔâÂäÄăĂĺĹćĆbBcCçÇdDđĐeE
-// éÉčČęĘëËfF�gGhHiIíÍěĚîÎďĎjJkKlLm
-// MnNńŃoOşóÓňŇôÔöÖőŐřŘśŚpPqQrRsSšŠ
-// ßtTţŢ™uUúÚůŮűŰüÜvVwWxXyYýÝ.źzZžŽ
+// ............................����
+// �'-­–—  .....!"#$%&()*,./:;?@[\]
+// ^ˆ_`{|}~¡¦¨¯´¸¿˜‘’‚“”„‹›+<=>±«»×
+// ÷¢£¤¥§©¬®°µ¶·†‡•…‰€0¼½¾1¹2²3³456
+// 789aAªáÁàÀâÂäÄãÃåÅæÆbBcCçÇdDðÐeE
+// éÉèÈêÊëËfFƒgGhHiIíÍìÌîÎïÏjJkKlLm
+// MnNñÑoOºóÓòÒôÔöÖõÕøØœŒpPqQrRsSšŠ
+// ßtTþÞ™uUúÚùÙûÛüÜvVwWxXyYýÝ.ŸzZžŽ
 
 const byte orderTableD6win[256] = {
 	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a,
@@ -1368,6 +1368,14 @@ const byte orderTableD6win[256] = {
 //
 // Director 8.5 Mac, MacRoman encoding
 //
+// ................................
+//   !"«»“”#$%&'‘’()*+,-./012345678
+// 9:;<=>?@AÁÀÂÄÃÅaáàâäãåÆæBbCÇcçDd
+// EÉÈÊËeéèêëFffiflGgHhIÍÌÎÏı.íìîïJjK
+// kLlMmNÑnñOÓÒÔÖΩØoóòôöõøŒœPpQqRrS
+// sßTtUÚÙÛÜuúùûüVvWwXxYyÿŸZz[\]^_`
+// {|}~.†°¢£§•¶®©™´¨≠∞±≤≥¥µ∂∑∏π∫ªºΩ
+// ¿¡¬√ƒ≈Δ…–—÷◊⁄¤‹›‡·‚„‰��¯˘˙˚¸˝˛.
 
 const byte orderTableD8mac[256] = {
 	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
@@ -1390,8 +1398,16 @@ const byte orderTableD8mac[256] = {
 
 
 //
-// Director 8.5-10 Win, cp1250 encoding
+// Director 8.5-10 Win, cp1252 encoding
 //
+// ­............................'-–
+// —  .....!"#$%&()*,./:;?@[\]ˆ._`{
+// |}~¡¦¨¯´¸¿˜‘’‚“”„‹›¢£¤¥€+<=>±«»×
+// ÷§©¬®°µ¶·…†‡•‰�����0¼½¾1¹2²3³456
+// 789aAªáÁàÀâÂäÄãÃåÅæÆbBcCçÇdDðÐeE
+// éÉèÈêÊëËfFƒgGhHiIíÍìÌîÎïÏjJkKlLm
+// MnNñÑoOºóÓòÒôÔöÖõÕøØœŒpPqQrRsSšŠ
+// ßtTþÞ™uUúÚùÙûÛüÜvVwWxXyYýÝ.ŸzZžŽ
 
 const byte orderTableD8win[256] = {
 	0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x23, 0x24, 0x25, 0x26, 0x27, 0x0a, 0x0b,

More information about the Scummvm-git-logs mailing list