mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r6404) -Fix: GetStringWidth failed to calculate correct string width if the string 

contained newlines.
This commit is contained in:
Darkvater 2006-09-05 23:02:31 +00:00
parent ec6189081d
commit 3b279b502f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx.c
View File

@ -542,8 +542,10 @@ void DrawStringMultiLine(int x, int y, StringID str, int maxw)
int GetStringWidth(const char *str)
{
FontSize size = _cur_fontsize;
int w = 0;
int w, max_w;
byte c;
w = max_w = 0;
for (c = *str; c != '\0'; c = *(++str)) {
if (c >= ASCII_LETTERSTART) {
w += GetCharacterWidth(size, c);
@ -552,9 +554,11 @@ int GetStringWidth(const char *str)
else if (c == ASCII_SETXY) str += 2;
else if (c == ASCII_TINYFONT) size = FS_SMALL;
else if (c == ASCII_BIGFONT) size = FS_LARGE;
else if (c == ASCII_NL && w > max_w) {max_w = w; w = 0;}
}
}
return w;
return max(w, max_w);
}