[Scummvm-git-logs] scummvm master -> 248c7e339a8717d4713bfce6b64ac17173c489f5
bluegr
noreply at scummvm.org
Sun Sep 15 22:27:11 UTC 2024
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
86347a3896 XEEN: Fix text wrapping in absence of whitespace
e94feec254 XEEN: Fix font height for Chinese font
35d36f3096 XEEN: Add font shadow for Chinese font
bb87dd1258 XEEN: Correct placement ofr non-Chinese characters inside Chinese text
c2685c5c33 XEEN: Make intro closer to the original
248c7e339a XEEN: Change order of language check, for uniformity
Commit: 86347a38969ac492d961cd8a0642a212e4c959d0
https://github.com/scummvm/scummvm/commit/86347a38969ac492d961cd8a0642a212e4c959d0
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-09-16T01:27:05+03:00
Commit Message:
XEEN: Fix text wrapping in absence of whitespace
Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
Changed paths:
engines/mm/xeen/font.cpp
diff --git a/engines/mm/xeen/font.cpp b/engines/mm/xeen/font.cpp
index 6a25f90fb53..3fa66c625c5 100644
--- a/engines/mm/xeen/font.cpp
+++ b/engines/mm/xeen/font.cpp
@@ -141,7 +141,10 @@ const char *FontSurface::writeString(const Common::String &s, const Common::Rect
if (endP == _displayString) {
// There was no word breaks at all in the string
- --displayEnd;
+ // Since the loop below includes displayEnd, we need to
+ // subtract 1 to compensate and another time to delete last
+ // char.
+ displayEnd -= 2;
if (_fontJustify == JUSTIFY_NONE && _writePos.x != bounds.left) {
// Move to the next line
if (!newLine(bounds))
Commit: e94feec254b61f66a4bb9b82974abfbe715fed8e
https://github.com/scummvm/scummvm/commit/e94feec254b61f66a4bb9b82974abfbe715fed8e
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-09-16T01:27:05+03:00
Commit Message:
XEEN: Fix font height for Chinese font
Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
Changed paths:
engines/mm/xeen/font.cpp
diff --git a/engines/mm/xeen/font.cpp b/engines/mm/xeen/font.cpp
index 3fa66c625c5..93a880681ce 100644
--- a/engines/mm/xeen/font.cpp
+++ b/engines/mm/xeen/font.cpp
@@ -371,7 +371,7 @@ bool FontSurface::newLine(const Common::Rect &bounds) {
_msgWraps = false;
_writePos.x = bounds.left;
- int hv = _fontReduced ? 9 : 10;
+ int hv = _isBig5 && _big5Font ? _big5Font->getFontHeight() + 1 : (_fontReduced ? 9 : 10);
_writePos.y += hv;
return ((_writePos.y + hv - 1) > bounds.bottom);
Commit: 35d36f30966dcf49319ab2cfdb8aafb6864a54cd
https://github.com/scummvm/scummvm/commit/35d36f30966dcf49319ab2cfdb8aafb6864a54cd
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-09-16T01:27:05+03:00
Commit Message:
XEEN: Add font shadow for Chinese font
Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
Changed paths:
engines/mm/xeen/font.cpp
diff --git a/engines/mm/xeen/font.cpp b/engines/mm/xeen/font.cpp
index 93a880681ce..624a90fa8fd 100644
--- a/engines/mm/xeen/font.cpp
+++ b/engines/mm/xeen/font.cpp
@@ -404,7 +404,9 @@ void FontSurface::writeChar(uint16_t c, const Common::Rect &clipRect) {
int y = _writePos.y;
if (_isBig5 && c > 0xff) {
_big5Font->drawBig5Char(surfacePtr(), c, _writePos, _textColors[0]);
- _writePos.x += kBig5Width;
+ _writePos.x++;
+ _big5Font->drawBig5Char(surfacePtr(), c, _writePos, _textColors[3]);
+ _writePos.x += kBig5Width - 1;
addDirtyRect(Common::Rect(_writePos.x, _writePos.y, _writePos.x + kBig5Width,
_writePos.y + kBig5Height));
Commit: bb87dd12589bd12a7d43847bea4bc95a2007c9f0
https://github.com/scummvm/scummvm/commit/bb87dd12589bd12a7d43847bea4bc95a2007c9f0
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-09-16T01:27:05+03:00
Commit Message:
XEEN: Correct placement ofr non-Chinese characters inside Chinese text
Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
Changed paths:
engines/mm/xeen/font.cpp
diff --git a/engines/mm/xeen/font.cpp b/engines/mm/xeen/font.cpp
index 624a90fa8fd..91fac408226 100644
--- a/engines/mm/xeen/font.cpp
+++ b/engines/mm/xeen/font.cpp
@@ -414,6 +414,9 @@ void FontSurface::writeChar(uint16_t c, const Common::Rect &clipRect) {
}
if (c == 'g' || c == 'p' || c == 'q' || c == 'y')
++y;
+ if (_isBig5 && _big5Font) {
+ y += (_big5Font->getFontHeight() - FONT_HEIGHT) / 2;
+ }
int yStart = y;
// Get pointers into font data and surface to write pixels to
Commit: c2685c5c33b35bff6e972363bfc1476974263fa0
https://github.com/scummvm/scummvm/commit/c2685c5c33b35bff6e972363bfc1476974263fa0
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-09-16T01:27:05+03:00
Commit Message:
XEEN: Make intro closer to the original
Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
Changed paths:
engines/mm/xeen/locations.cpp
diff --git a/engines/mm/xeen/locations.cpp b/engines/mm/xeen/locations.cpp
index 3e4d76dba13..bd10bdb9d0d 100644
--- a/engines/mm/xeen/locations.cpp
+++ b/engines/mm/xeen/locations.cpp
@@ -2382,7 +2382,7 @@ bool LocationMessage::execute(int portrait, const Common::String &name, const Co
int result = -1;
Common::String msgText = text;
do {
- Common::String msg = Common::String::format("\r\v014\x03""c\t125%s\t000\v054%s",
+ Common::String msg = Common::String::format(Common::ZH_TWN == g_vm->getLanguage() ? "\r\v014\x0c""07\x03""c\t125%s\x0c""04\x03""l\t000\v044%s" : "\r\v014\x03""c\t125%s\t000\v054%s",
name.c_str(), msgText.c_str());
// Count the number of words
Commit: 248c7e339a8717d4713bfce6b64ac17173c489f5
https://github.com/scummvm/scummvm/commit/248c7e339a8717d4713bfce6b64ac17173c489f5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-09-16T01:27:05+03:00
Commit Message:
XEEN: Change order of language check, for uniformity
Changed paths:
engines/mm/xeen/locations.cpp
diff --git a/engines/mm/xeen/locations.cpp b/engines/mm/xeen/locations.cpp
index bd10bdb9d0d..b99c808c0e8 100644
--- a/engines/mm/xeen/locations.cpp
+++ b/engines/mm/xeen/locations.cpp
@@ -2382,7 +2382,7 @@ bool LocationMessage::execute(int portrait, const Common::String &name, const Co
int result = -1;
Common::String msgText = text;
do {
- Common::String msg = Common::String::format(Common::ZH_TWN == g_vm->getLanguage() ? "\r\v014\x0c""07\x03""c\t125%s\x0c""04\x03""l\t000\v044%s" : "\r\v014\x03""c\t125%s\t000\v054%s",
+ Common::String msg = Common::String::format(g_vm->getLanguage() == Common::ZH_TWN ? "\r\v014\x0c""07\x03""c\t125%s\x0c""04\x03""l\t000\v044%s" : "\r\v014\x03""c\t125%s\t000\v054%s",
name.c_str(), msgText.c_str());
// Count the number of words
More information about the Scummvm-git-logs
mailing list