libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 01:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA: (ITE/PC98) - fine tune intro line breaks

Browse Source 
I whish I knew whether I am implementing an original bug here or if this is intended behavior. But it does achieve text output faithful to the original. And it even does actually look better...
This commit is contained in:
athrxx 2020-11-21 01:23:38 +01:00
parent 3aded1d5ba
commit c9f41699aa
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/saga/font.cpp
View File

@ -711,10 +711,11 @@ void SJISFont::textDrawRect(FontId fontId, const char *text, const Common::Rect
int numChar = 0;
const char *pos = text;
const char *last = 0;
int checkWidth = (rect.width() - 16) & ~7;
for (uint16 c = fetchChar(pos); c; c = fetchChar(pos)) {
curW += (_font->getCharWidth(c) >> 1);
if (curW > rect.width() || c == (uint16)'\r' || c == (uint16)'\n') {
if ((curW > checkWidth && !preventLineBreakForCharacter(c)) || c == (uint16)'\r' || c == (uint16)'\n') {
draw(fontId, text, numChar, textPoint, color, effectColor, flags);
numChar = 0;
textPoint.x = rect.left;
@ -736,9 +737,9 @@ void SJISFont::textDrawRect(FontId fontId, const char *text, const Common::Rect
// If the whole string fits into one line it gets aligned to the center
if (textPoint.y == rect.top)
textPoint.x = textPoint.x + rect.width() / 2 - (getStringWidth(fontId, text, 0, flags) / 2);
textPoint.x = textPoint.x + (rect.width() - getStringWidth(fontId, text, 0, flags)) / 2;
draw(fontId, text, numChar, textPoint, color, effectColor, flags);
draw(fontId, text, numChar, textPoint, color, effectColor, flags);
}
int SJISFont::getStringLength(const char *text) {
@ -758,12 +759,8 @@ int SJISFont::getStringWidth(FontId fontId, const char *text, size_t count, Font
for (uint16 c = fetchChar(text); c; c = fetchChar(text)) {
if (c == (uint16)'\r' || c == (uint16)'\n') {
maxW = MAX<int>(curW, maxW);
#if 1
curW = 0;
continue;
#else
break;
#endif
}
curW += _font->getCharWidth(c);
if (!--count)
@ -782,16 +779,18 @@ int SJISFont::getHeight(FontId fontId, const char *text, int width, FontEffectFl
_font->setDrawingMode(mode);
int res = _font->getFontHeight();
int checkWidth = (width - 16) & ~7;
int tmpWidth = 0;
for (uint16 c = fetchChar(text); c; c = fetchChar(text)) {
// The spacing is always the same (regardless of the fontId and font style) for the char spacing, but not for the line spacing.
_font->setDrawingMode(Graphics::FontSJIS::kDefaultMode);
tmpWidth += (_font->getCharWidth(c) >> 1);
if (tmpWidth > width || c == (uint16)'\r' || c == (uint16)'\n') {
if ((tmpWidth > checkWidth && !preventLineBreakForCharacter(c)) || c == (uint16)'\r' || c == (uint16)'\n') {
tmpWidth = tmpWidth > width ? _font->getCharWidth(c) >> 1 : 0;
_font->setDrawingMode(mode);
res += _font->getFontHeight();
}
}
}
return (res + 1) >> 1;
@ -854,4 +853,9 @@ uint16 SJISFont::fetchChar(const char *&s) const {
return ch;
}
bool SJISFont::preventLineBreakForCharacter(uint16 ch) const {
uint8 c = (ch >> 8) & 0xFF;
return c && ((c >= 0x81 && c <= 0x9F) || c >= 0xE0);
}
} // End of namespace Saga

3
engines/saga/font.h
View File

@ -237,7 +237,7 @@ class DefaultFont : public Font {
void outFont(const FontStyle &drawFont, const char *text, size_t count, const Common::Point &point, int color, FontEffectFlags flags);
void loadFont(FontData *font, uint32 fontResourceId);
void createOutline(FontData *font);
int getByteLen(int numBits) const {
int byteLength = numBits / 8;
@ -271,6 +271,7 @@ private:
void draw(FontId fontId, const char *text, size_t count, const Common::Point &point, int color, int effectColor, FontEffectFlags flags) override;
uint16 fetchChar(const char *&s) const;
bool preventLineBreakForCharacter(uint16 ch) const;
Graphics::FontSJIS *_font;
};