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

(svn r7674) -Backport from trunk (r7580): 

- Wrong bounding boxes were computed for certain strings.
This commit is contained in:
Darkvater 2006-12-30 23:22:55 +00:00
parent 0adf61e7fa
commit 59167f686e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx.c
View File

@ -449,6 +449,11 @@ end_of_inner_loop:
}
}
/** Draw a given string with the centre around the given x coordinates
* @param x Centre the string around this pixel width
* @param y Draw the string at this pixel height (first line's bottom)
* @param str String to draw
* @param max Maximum width the string can have before it is wrapped */
void DrawStringMultiCenter(int x, int y, StringID str, int maxw)
{
char buffer[512];
@ -555,10 +560,10 @@ BoundingRect GetStringBoundingBox(const char *str)
br.width += GetCharacterWidth(size, c);
} else {
switch (c) {
case SCC_SETX: br.width += (byte)*++str; break;
case SCC_SETX: br.width += (byte)*str++; break;
case SCC_SETXY:
br.width += (byte)*++str;
br.height += (byte)*++str;
br.width += (byte)*str++;
br.height += (byte)*str++;
break;
case SCC_TINYFONT: size = FS_SMALL; break;
case SCC_BIGFONT: size = FS_LARGE; break;
@ -653,7 +658,7 @@ skip_cont:;
} else if (c == SCC_BIGFONT) { // {BIGFONT}
size = FS_LARGE;
} else {
printf("Unknown string command character %d\n", c);
DEBUG(misc, 0, "[utf8] unknown string command character %d", c);
}
}
}