libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-22 20:21:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed text bugs related to the fact that some strings in the data files don't end with '|' like they should.

Browse Source 
svn-id: r42897
This commit is contained in:
Denis Kasak 2009-07-29 16:39:12 +00:00
parent e9669b8e2b
commit bc89ce23d3
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/draci/font.cpp
View File

@ -266,17 +266,21 @@ int Font::getStringWidth(const Common::String &str, int spacing) const {
for (unsigned int i = 0, tmp = 0; i < len; ++i) {
// Newline char encountered, skip it and store the new length if it is greater
if (str[i] == '|') {
if (str[i] != '|') {
uint8 charIndex = str[i] - kCharIndexOffset;
tmp += _charWidths[charIndex];
tmp += spacing;
}
// Newline char encountered, skip it and store the new length if it is greater.
// Also, all strings in the data files should end with '|' but not all do.
// This is why we check whether we are at the last char too.
if (str[i] == '|' || i == len - 1) {
if (tmp > width) {
width = tmp;
}
continue;
}
uint8 charIndex = str[i] - kCharIndexOffset;
tmp += _charWidths[charIndex];
tmp += spacing;
}
return width + 1;
@ -298,7 +302,9 @@ int Font::getStringHeight(const Common::String &str) const {
int separators = 0;
for (unsigned int i = 0; i < len; ++i) {
if (str[i] == '|') {
// All strings in the data files should end with '|' but not all do.
// This is why we check whether we are at the last char too.
if (str[i] == '|' || i == len - 1) {
++separators;
}
}