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

(svn r17842) -Fix: DrawStringMultiLine would in some corner case, top = bottom + 1, draw the string

This commit is contained in:
rubidium 2009-10-22 14:24:11 +00:00
parent c90885a17e
commit 0501bd1325
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gfx.cpp
View File

@ -791,6 +791,10 @@ int DrawStringMultiLine(int left, int right, int top, int bottom, StringID str,
int maxw = right - left + 1;
int maxh = bottom - top + 1;
/* It makes no sense to even try if it can't be drawn anyway, or
* do we really want to support fonts of 0 or less pixels high? */
if (maxh <= 0) return top;
char buffer[DRAW_STRING_BUFFER];
GetString(buffer, str, lastof(buffer));
@ -800,7 +804,7 @@ int DrawStringMultiLine(int left, int right, int top, int bottom, StringID str,
int mt = GetCharacterHeight((FontSize)GB(tmp, 16, 16));
int total_height = (num + 1) * mt;
if (maxh != 0 && total_height > maxh) {
if (total_height > maxh) {
/* Check there's room enough for at least one line. */
if (maxh < mt) return top;