[Scummvm-git-logs] scummvm master -> cff061d690efc6fd59d6082c76b89fe761a595fc
bluegr
noreply at scummvm.org
Sat May 7 05:41:44 UTC 2022
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3431a050ec SCUMM: Add Hebrew font for zak and MM
e3fb64f4ff Apply suggestions from code review
cff061d690 SCUMM: Add Hebrew font for zak and MM
Commit: 3431a050ecd829dc29eb11a7527d590c06a9164e
https://github.com/scummvm/scummvm/commit/3431a050ecd829dc29eb11a7527d590c06a9164e
Author: ShaharAriel (ShaharAriel at users.noreply.github.com)
Date: 2022-05-07T08:41:39+03:00
Commit Message:
SCUMM: Add Hebrew font for zak and MM
The replacement character tables have been created using the make-charset-fontdata tool.
Changed paths:
engines/scumm/charset-fontdata.cpp
diff --git a/engines/scumm/charset-fontdata.cpp b/engines/scumm/charset-fontdata.cpp
index 2697dc5f8c8..31c4799e301 100644
--- a/engines/scumm/charset-fontdata.cpp
+++ b/engines/scumm/charset-fontdata.cpp
@@ -549,6 +549,67 @@ static const byte russCharsetDataV2[] = {
125, 233,
126, 231,
};
+// Hebrew Zak and MM font map.
+ static const byte hebrewCharsetMapV2[] = {
+ 65, 0,
+ 66, 1,
+ 67, 2,
+ 68, 3,
+ 69, 4,
+ 70, 5,
+ 71, 6,
+ 72, 7,
+ 73, 8,
+ 74, 9,
+ 75, 10,
+ 76, 11,
+ 77, 12,
+ 78, 13,
+ 79, 14,
+ 80, 15,
+ 81, 16,
+ 82, 17,
+ 83, 18,
+ 84, 19,
+ 85, 20,
+ 86, 21,
+ 87, 22,
+ 88, 23,
+ 89, 24,
+ 90, 25,
+ 91, 26,
+ };
+
+//Hebrew Zak and MM font data
+ static const byte hebrewCharsetDataV2[] = {
+ 0x00, 0x84, 0x44, 0x64, 0x98, 0x88, 0x84, 0x00,
+ 0x00, 0xf0, 0x08, 0x08, 0x08, 0x08, 0xfc, 0x00,
+ 0x00, 0x60, 0x10, 0x10, 0x30, 0x50, 0x90, 0x00,
+ 0x00, 0xfc, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+ 0x00, 0xf8, 0x04, 0x04, 0x84, 0x84, 0x84, 0x00,
+ 0x00, 0xc0, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+ 0x00, 0xe0, 0x40, 0x40, 0x20, 0x20, 0x40, 0x00,
+ 0x00, 0xf8, 0x84, 0x84, 0x84, 0x84, 0x84, 0x00,
+ 0x00, 0x88, 0x94, 0x84, 0x84, 0x84, 0xf8, 0x00,
+ 0x00, 0xe0, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xfc, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08,
+ 0x00, 0xf8, 0x04, 0x04, 0x04, 0x04, 0xf8, 0x00,
+ 0x80, 0xf8, 0x04, 0x04, 0x04, 0x08, 0x30, 0x00,
+ 0x00, 0xf8, 0x44, 0x84, 0x84, 0x84, 0xfc, 0x00,
+ 0x00, 0x9c, 0x64, 0x44, 0x84, 0x84, 0xbc, 0x00,
+ 0x00, 0xc0, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x00, 0x60, 0x10, 0x10, 0x10, 0x10, 0xf0, 0x00,
+ 0x00, 0xfc, 0x44, 0x84, 0x84, 0x48, 0x30, 0x00,
+ 0x00, 0x24, 0x24, 0x24, 0x24, 0x28, 0xf0, 0x00,
+ 0x00, 0xf8, 0x44, 0x44, 0x64, 0x04, 0x04, 0x04,
+ 0x00, 0xf8, 0x44, 0x44, 0x64, 0x04, 0xfc, 0x00,
+ 0x00, 0x84, 0x44, 0x48, 0x30, 0x20, 0x20, 0x20,
+ 0x00, 0x84, 0x44, 0x28, 0x10, 0x08, 0xfc, 0x00,
+ 0x00, 0xf8, 0x04, 0x44, 0x48, 0x50, 0x40, 0x40,
+ 0x00, 0xf8, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00,
+ 0x00, 0x92, 0x92, 0x92, 0xa2, 0xc4, 0xf8, 0x00,
+ 0x00, 0xf8, 0x44, 0x44, 0x44, 0x44, 0xc4, 0x00,
+ };
// Special characters
static const byte specialCharsetData[] = {
@@ -628,6 +689,13 @@ CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
_fontPtr = russianCharsetDataV2;
}
break;
+ case Common::HE_ISR:
+ if (((_vm->_game.id == GID_MANIAC) || (_vm->_game.id == GID_ZAK)) && (_vm->_game.version == 2)) {
+ replacementMap = hebrewCharsetMapV2;
+ replacementChars = sizeof(hebrewCharsetMapV2) / 2;
+ replacementData = hebrewCharsetDataV2;
+ }
+ break;
default:
_fontPtr = englishCharsetDataV2;
break;
Commit: e3fb64f4ff43af4971c310a23cfa31259626ef32
https://github.com/scummvm/scummvm/commit/e3fb64f4ff43af4971c310a23cfa31259626ef32
Author: ShaharAriel (ShaharAriel at users.noreply.github.com)
Date: 2022-05-07T08:41:39+03:00
Commit Message:
Apply suggestions from code review
Fix some indentation and remove unnecessary parentheses
Co-authored-by: Filippos Karapetis <bluegr at gmail.com>
Changed paths:
engines/scumm/charset-fontdata.cpp
diff --git a/engines/scumm/charset-fontdata.cpp b/engines/scumm/charset-fontdata.cpp
index 31c4799e301..ef9f3d51823 100644
--- a/engines/scumm/charset-fontdata.cpp
+++ b/engines/scumm/charset-fontdata.cpp
@@ -549,7 +549,7 @@ static const byte russCharsetDataV2[] = {
125, 233,
126, 231,
};
-// Hebrew Zak and MM font map.
+ // Hebrew Zak and MM font map.
static const byte hebrewCharsetMapV2[] = {
65, 0,
66, 1,
@@ -580,7 +580,7 @@ static const byte russCharsetDataV2[] = {
91, 26,
};
-//Hebrew Zak and MM font data
+ // Hebrew Zak and MM font data
static const byte hebrewCharsetDataV2[] = {
0x00, 0x84, 0x44, 0x64, 0x98, 0x88, 0x84, 0x00,
0x00, 0xf0, 0x08, 0x08, 0x08, 0x08, 0xfc, 0x00,
@@ -690,7 +690,7 @@ CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
}
break;
case Common::HE_ISR:
- if (((_vm->_game.id == GID_MANIAC) || (_vm->_game.id == GID_ZAK)) && (_vm->_game.version == 2)) {
+ if ((_vm->_game.id == GID_MANIAC || _vm->_game.id == GID_ZAK) && _vm->_game.version == 2) {
replacementMap = hebrewCharsetMapV2;
replacementChars = sizeof(hebrewCharsetMapV2) / 2;
replacementData = hebrewCharsetDataV2;
Commit: cff061d690efc6fd59d6082c76b89fe761a595fc
https://github.com/scummvm/scummvm/commit/cff061d690efc6fd59d6082c76b89fe761a595fc
Author: ShaharAriel (ShaharAriel at users.noreply.github.com)
Date: 2022-05-07T08:41:39+03:00
Commit Message:
SCUMM: Add Hebrew font for zak and MM
Remove the game.id check conditions.
Changed paths:
engines/scumm/charset-fontdata.cpp
diff --git a/engines/scumm/charset-fontdata.cpp b/engines/scumm/charset-fontdata.cpp
index ef9f3d51823..3794c122cd2 100644
--- a/engines/scumm/charset-fontdata.cpp
+++ b/engines/scumm/charset-fontdata.cpp
@@ -549,67 +549,68 @@ static const byte russCharsetDataV2[] = {
125, 233,
126, 231,
};
- // Hebrew Zak and MM font map.
- static const byte hebrewCharsetMapV2[] = {
- 65, 0,
- 66, 1,
- 67, 2,
- 68, 3,
- 69, 4,
- 70, 5,
- 71, 6,
- 72, 7,
- 73, 8,
- 74, 9,
- 75, 10,
- 76, 11,
- 77, 12,
- 78, 13,
- 79, 14,
- 80, 15,
- 81, 16,
- 82, 17,
- 83, 18,
- 84, 19,
- 85, 20,
- 86, 21,
- 87, 22,
- 88, 23,
- 89, 24,
- 90, 25,
- 91, 26,
- };
- // Hebrew Zak and MM font data
- static const byte hebrewCharsetDataV2[] = {
- 0x00, 0x84, 0x44, 0x64, 0x98, 0x88, 0x84, 0x00,
- 0x00, 0xf0, 0x08, 0x08, 0x08, 0x08, 0xfc, 0x00,
- 0x00, 0x60, 0x10, 0x10, 0x30, 0x50, 0x90, 0x00,
- 0x00, 0xfc, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
- 0x00, 0xf8, 0x04, 0x04, 0x84, 0x84, 0x84, 0x00,
- 0x00, 0xc0, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
- 0x00, 0xe0, 0x40, 0x40, 0x20, 0x20, 0x40, 0x00,
- 0x00, 0xf8, 0x84, 0x84, 0x84, 0x84, 0x84, 0x00,
- 0x00, 0x88, 0x94, 0x84, 0x84, 0x84, 0xf8, 0x00,
- 0x00, 0xe0, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0xfc, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08,
- 0x00, 0xf8, 0x04, 0x04, 0x04, 0x04, 0xf8, 0x00,
- 0x80, 0xf8, 0x04, 0x04, 0x04, 0x08, 0x30, 0x00,
- 0x00, 0xf8, 0x44, 0x84, 0x84, 0x84, 0xfc, 0x00,
- 0x00, 0x9c, 0x64, 0x44, 0x84, 0x84, 0xbc, 0x00,
- 0x00, 0xc0, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40,
- 0x00, 0x60, 0x10, 0x10, 0x10, 0x10, 0xf0, 0x00,
- 0x00, 0xfc, 0x44, 0x84, 0x84, 0x48, 0x30, 0x00,
- 0x00, 0x24, 0x24, 0x24, 0x24, 0x28, 0xf0, 0x00,
- 0x00, 0xf8, 0x44, 0x44, 0x64, 0x04, 0x04, 0x04,
- 0x00, 0xf8, 0x44, 0x44, 0x64, 0x04, 0xfc, 0x00,
- 0x00, 0x84, 0x44, 0x48, 0x30, 0x20, 0x20, 0x20,
- 0x00, 0x84, 0x44, 0x28, 0x10, 0x08, 0xfc, 0x00,
- 0x00, 0xf8, 0x04, 0x44, 0x48, 0x50, 0x40, 0x40,
- 0x00, 0xf8, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00,
- 0x00, 0x92, 0x92, 0x92, 0xa2, 0xc4, 0xf8, 0x00,
- 0x00, 0xf8, 0x44, 0x44, 0x44, 0x44, 0xc4, 0x00,
- };
+// Hebrew Zak and MM font map.
+static const byte hebrewCharsetMapV2[] = {
+ 65, 0,
+ 66, 1,
+ 67, 2,
+ 68, 3,
+ 69, 4,
+ 70, 5,
+ 71, 6,
+ 72, 7,
+ 73, 8,
+ 74, 9,
+ 75, 10,
+ 76, 11,
+ 77, 12,
+ 78, 13,
+ 79, 14,
+ 80, 15,
+ 81, 16,
+ 82, 17,
+ 83, 18,
+ 84, 19,
+ 85, 20,
+ 86, 21,
+ 87, 22,
+ 88, 23,
+ 89, 24,
+ 90, 25,
+ 91, 26,
+};
+
+// Hebrew Zak and MM font data
+static const byte hebrewCharsetDataV2[] = {
+ 0x00, 0x84, 0x44, 0x64, 0x98, 0x88, 0x84, 0x00,
+ 0x00, 0xf0, 0x08, 0x08, 0x08, 0x08, 0xfc, 0x00,
+ 0x00, 0x60, 0x10, 0x10, 0x30, 0x50, 0x90, 0x00,
+ 0x00, 0xfc, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+ 0x00, 0xf8, 0x04, 0x04, 0x84, 0x84, 0x84, 0x00,
+ 0x00, 0xc0, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+ 0x00, 0xe0, 0x40, 0x40, 0x20, 0x20, 0x40, 0x00,
+ 0x00, 0xf8, 0x84, 0x84, 0x84, 0x84, 0x84, 0x00,
+ 0x00, 0x88, 0x94, 0x84, 0x84, 0x84, 0xf8, 0x00,
+ 0x00, 0xe0, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xfc, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08,
+ 0x00, 0xf8, 0x04, 0x04, 0x04, 0x04, 0xf8, 0x00,
+ 0x80, 0xf8, 0x04, 0x04, 0x04, 0x08, 0x30, 0x00,
+ 0x00, 0xf8, 0x44, 0x84, 0x84, 0x84, 0xfc, 0x00,
+ 0x00, 0x9c, 0x64, 0x44, 0x84, 0x84, 0xbc, 0x00,
+ 0x00, 0xc0, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x00, 0x60, 0x10, 0x10, 0x10, 0x10, 0xf0, 0x00,
+ 0x00, 0xfc, 0x44, 0x84, 0x84, 0x48, 0x30, 0x00,
+ 0x00, 0x24, 0x24, 0x24, 0x24, 0x28, 0xf0, 0x00,
+ 0x00, 0xf8, 0x44, 0x44, 0x64, 0x04, 0x04, 0x04,
+ 0x00, 0xf8, 0x44, 0x44, 0x64, 0x04, 0xfc, 0x00,
+ 0x00, 0x84, 0x44, 0x48, 0x30, 0x20, 0x20, 0x20,
+ 0x00, 0x84, 0x44, 0x28, 0x10, 0x08, 0xfc, 0x00,
+ 0x00, 0xf8, 0x04, 0x44, 0x48, 0x50, 0x40, 0x40,
+ 0x00, 0xf8, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00,
+ 0x00, 0x92, 0x92, 0x92, 0xa2, 0xc4, 0xf8, 0x00,
+ 0x00, 0xf8, 0x44, 0x44, 0x44, 0x44, 0xc4, 0x00,
+};
// Special characters
static const byte specialCharsetData[] = {
@@ -690,11 +691,9 @@ CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
}
break;
case Common::HE_ISR:
- if ((_vm->_game.id == GID_MANIAC || _vm->_game.id == GID_ZAK) && _vm->_game.version == 2) {
- replacementMap = hebrewCharsetMapV2;
- replacementChars = sizeof(hebrewCharsetMapV2) / 2;
- replacementData = hebrewCharsetDataV2;
- }
+ replacementMap = hebrewCharsetMapV2;
+ replacementChars = sizeof(hebrewCharsetMapV2) / 2;
+ replacementData = hebrewCharsetDataV2;
break;
default:
_fontPtr = englishCharsetDataV2;
More information about the Scummvm-git-logs
mailing list