[Scummvm-git-logs] scummvm branch-2-7 -> 7abd3f827dd9cffb46d7cf44a4da58ddc77c6b8a
neuromancer
noreply at scummvm.org
Sun Jul 9 09:20:31 UTC 2023
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:
a269c59cfc COMMON: Make BitArray::get const
e21cd56524 HYPNO: Support rendering Korean font for Wetlands
7abd3f827d HYPNO: Add Korean version of "Enter name:" string
Commit: a269c59cfc0d26b0403dab6b8937430d5ec690a2
https://github.com/scummvm/scummvm/commit/a269c59cfc0d26b0403dab6b8937430d5ec690a2
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-07-09T11:19:00+02:00
Commit Message:
COMMON: Make BitArray::get const
Changed paths:
common/bitarray.h
diff --git a/common/bitarray.h b/common/bitarray.h
index bf94b9c2794..344ff54a0c7 100644
--- a/common/bitarray.h
+++ b/common/bitarray.h
@@ -64,7 +64,7 @@ public:
_bits[bit / 8] &= ~(1 << (bit % 8));
}
- bool get(uint bit) {
+ bool get(uint bit) const {
return _bits[bit / 8] & (1 << (bit % 8));
}
Commit: e21cd56524bb34ce482190ddbcd4bfaf6733ed41
https://github.com/scummvm/scummvm/commit/e21cd56524bb34ce482190ddbcd4bfaf6733ed41
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-07-09T11:19:27+02:00
Commit Message:
HYPNO: Support rendering Korean font for Wetlands
Changed paths:
engines/hypno/hypno.h
engines/hypno/wet/wet.cpp
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index eddbc7140d4..a507a1e0317 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -427,6 +427,9 @@ public:
private:
Common::String getLocalizedString(const Common::String name);
+ uint16 getNextChar(const Common::String &str, uint32 &c);
+ void drawGlyph(const Common::BitArray &font, int x, int y, int bitoffset, int width, int height, int pitch, uint32 color, bool invert);
+ void drawKoreanChar(uint16 chr, int &curx, int y, uint32 color);
void runMainMenu(Code *code);
void runLevelMenu(Code *code);
void runCheckLives(Code *code);
@@ -447,6 +450,7 @@ private:
Common::BitArray _font05;
Common::BitArray _font08;
+ Common::BitArray _fontg9a;
Common::Array<uint32> _c40SegmentPath;
Common::Array<uint32> _c40SegmentNext;
int _c40SegmentIdx;
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index b397b4f65d1..275d5c1400c 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -596,46 +596,143 @@ void WetEngine::loadFonts() {
_font08.set_size(file.size()*8);
_font08.set_bits((byte *)font);
+ file.close();
free(font);
+
+ if (_language == Common::KO_KOR) {
+ if (!file.open("C_MISC/G9A.SYF"))
+ error("Cannot open Korean font");
+
+ font = (byte *)malloc(file.size());
+ file.read(font, file.size());
+
+ _fontg9a.set_size(file.size()*8);
+ _fontg9a.set_bits((byte *)font);
+
+ free(font);
+ }
+}
+
+uint16 WetEngine::getNextChar(const Common::String &str, uint32 &c) {
+ if (c >= str.size())
+ return 0;
+ if (_language == Common::KO_KOR && (str[c] & 0x80) && c + 1 < str.size()) {
+ uint16 r = (str[c] << 8) | (str[c+1] & 0xff);
+ c += 2;
+ return r;
+ }
+
+ return str[c++];
+}
+
+void WetEngine::drawGlyph(const Common::BitArray &font, int x, int y, int bitoffset, int width, int height, int pitch, uint32 color, bool invert) {
+ for (int i = 0; i < width; i++) {
+ for (int j = 0; j < height; j++) {
+ if (font.get(bitoffset + j * pitch + i) == invert)
+ _compositeSurface->setPixel(x + (width - i - 1), y + j, color);
+ }
+ }
+}
+
+void WetEngine::drawKoreanChar(uint16 chr, int &curx, int y, uint32 color) {
+ // TODO: What do the first 13 bytes and a byte before ASCII char mean?
+ if (chr < 0x100) {
+ if (chr < 0x20 || chr >= 0x80) {
+ return;
+ }
+ drawGlyph(_fontg9a, curx, y, 104 + 19 * 8 * (chr - 0x20), 9, 9, 16, color, true);
+ curx += 9;
+ return;
+ }
+
+ int initial = (chr >> 10) & 0x1f;
+ int mid = (chr >> 5) & 0x1f;
+ int fin = chr & 0x1f;
+
+ int initidx = initial - 1;
+ static const int mididxlut[0x20] = {
+ -1, -1, 0, 1, 2, 3, 4, 5, -1, -1, 6, 7, 8, 9,
+ 10, 11, -1, -1, 12, 13, 14, 15, 16, 17, -1, -1,
+ 18, 19, 20, 21, -1, -1};
+ int mididx = mididxlut[mid];
+ int finidx = fin >= 0x12 ? fin - 2 : fin - 1;
+
+ if (initidx < 0 || initidx > 19 || mididx < 0 || mididx > 21 || finidx < 0 || finidx >= 27)
+ return;
+
+ const int mid_to_init_lut[32] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 3, 3,
+ 0, 0, 3, 1, 2, 4, 4, 4,
+ 0, 0, 2, 1, 3, 0, 0, 0,
+ };
+ const int mid_to_fin_lut[32] = {
+ 0, 0, 0, 0, 2, 0, 2, 1,
+ 0, 0, 2, 1, 2, 3, 0, 2,
+ 0, 0, 1, 3, 3, 1, 2, 1,
+ 0, 0, 3, 3, 1, 1, 0, 0,
+ };
+ int initialvariant = 2 * mid_to_init_lut[mid] + (fin == 1 ? 0 : 1);
+ int midvariant = (fin == 1 ? 0 : 1) + (initial == 1 || initial == 2 || initial == 17 ? 0 : 2);
+ int finvariant = mid_to_fin_lut[mid];
+
+ int initialglyph = initidx == 0 ? 0 : initidx * 10 + initialvariant - 9;
+ int midglyph = mididx == 0 ? 0 : 4 * mididx + midvariant - 3;
+ int finglyph = finidx == 0 ? 0 : 4 * finidx + finvariant - 3;
+
+ drawGlyph(_fontg9a, curx, y, 1836 * 8 + 16 * 9 * initialglyph, 9, 9, 16, color, true);
+ drawGlyph(_fontg9a, curx, y, 1836 * 8 + 16 * 9 * 191 + 16 * 9 * midglyph, 9, 9, 16, color, true);
+ drawGlyph(_fontg9a, curx, y, 1836 * 8 + 16 * 9 * 276 + 16 * 9 * finglyph, 9, 9, 16, color, true);
+ curx += 9;
}
void WetEngine::drawString(const Common::String &font, const Common::String &str, int x, int y, int w, uint32 color) {
int offset = 0;
- if (font == "block05.fgx") {
- for (uint32 c = 0; c < str.size(); c++) {
+ int curx = x;
+ if (font == "g9a.syf" && _language == Common::KO_KOR) {
+ for (uint32 c = 0; c < str.size(); ) {
+ uint16 chr = getNextChar(str, c);
+ drawKoreanChar(chr, curx, y, color);
+ }
+ } else if (font == "block05.fgx") {
+ for (uint32 c = 0; c < str.size(); ) {
+ uint16 chr = getNextChar(str, c);
+
+ if (chr >= 0x100 && _language == Common::KO_KOR) {
+ drawKoreanChar(chr, curx, y, color);
+ continue;
+ }
offset = 0;
- if (str[c] == ':')
+ if (chr == ':')
offset = 1;
- else if (str[c] == '.')
+ else if (chr == '.')
offset = 4;
- for (int i = 0; i < 5; i++) {
- for (int j = 0; j < 5; j++) {
- if (!_font05.get(275 + 40*str[c] + j*8 + i))
- _compositeSurface->setPixel(x + 5 - i + 6*c, offset + y + j, color);
- }
- }
+ drawGlyph(_font05, curx + 1, offset + y, 275 + 40*chr, 5, 5, 8, color, false);
+ curx += 6;
}
} else if (font == "scifi08.fgx") {
- for (uint32 c = 0; c < str.size(); c++) {
- if (str[c] == 0)
+ for (uint32 c = 0; c < str.size();) {
+ uint16 chr = getNextChar(str, c);
+ if (chr >= 0x100 && _language == Common::KO_KOR) {
+ drawKoreanChar(chr, curx, y, color);
continue;
- assert(str[c] >= 32);
+ }
+
+ if (chr == 0)
+ continue;
+ assert(chr >= 32);
offset = 0;
- if (str[c] == 't')
+ if (chr == 't')
offset = 0;
- else if (str[c] == 'i' || str[c] == '%')
+ else if (chr == 'i' || chr == '%')
offset = 1;
- else if (Common::isLower(str[c]) || str[c] == ':')
+ else if (Common::isLower(chr) || chr == ':')
offset = 2;
- for (int i = 0; i < 6; i++) {
- for (int j = 0; j < 8; j++) {
- if (!_font08.get(1554 + 72*(str[c]-32) + j*8 + i))
- _compositeSurface->setPixel(x + 6 - i + 7*c, offset + y + j, color);
- }
- }
+ drawGlyph(_font08, curx + 1, offset + y, 1554 + 72*(chr-32), 6, 8, 8, color, false);
+ curx += 7;
}
} else
error("Invalid font: '%s'", font.c_str());
Commit: 7abd3f827dd9cffb46d7cf44a4da58ddc77c6b8a
https://github.com/scummvm/scummvm/commit/7abd3f827dd9cffb46d7cf44a4da58ddc77c6b8a
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-07-09T11:21:55+02:00
Commit Message:
HYPNO: Add Korean version of "Enter name:" string
Changed paths:
engines/hypno/wet/hard.cpp
diff --git a/engines/hypno/wet/hard.cpp b/engines/hypno/wet/hard.cpp
index 3e23fa87025..aee02a0eb53 100644
--- a/engines/hypno/wet/hard.cpp
+++ b/engines/hypno/wet/hard.cpp
@@ -314,6 +314,8 @@ Common::String WetEngine::getLocalizedString(const Common::String name) {
return "NOM :";
case Common::ES_ESP:
return "NOMBRE :";
+ case Common::KO_KOR:
+ return "\xb7\xa1\x9f\x71\xb7\xb3\x9d\x62:";
default:
return "ENTER NAME :";
}
More information about the Scummvm-git-logs
mailing list