# HG changeset patch # User rubidium # Date 2009-10-22 14:24:11 # Node ID 150c888829cac80c6ac4ba0337218ad8e0ae71f6 # Parent e674c79ed3d5a1fbe4333a55295c6006a4aa63ee (svn r17842) -Fix: DrawStringMultiLine would in some corner case, top = bottom + 1, draw the string diff --git a/src/gfx.cpp b/src/gfx.cpp --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -791,6 +791,10 @@ int DrawStringMultiLine(int left, int ri 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 ri 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;