(svn r9472) -Fix (r9449): num is the number of newlines in the string, not the number of lines. Also allow for maxh being negative.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/gfx.cpp b/src/gfx.cpp
index ae2bd18f9..8797c7739 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -548,10 +548,11 @@ uint DrawStringMultiLine(int x, int y, StringID str, int maxw, int maxh)
 	mt = GetCharacterHeight((FontSize)GB(tmp, 16, 16));
 	total_height = (num + 1) * mt;
 
-	if (maxh != -1 && total_height > (uint)maxh) {
-		num = maxh / mt - 1;
-		if (num < 1) return 0;
+	if (maxh != -1 && (int)total_height > maxh) {
+		/* Check there's room enough for at least one line. */
+		if (maxh < mt) return 0;
 
+		num = maxh / mt - 1;
 		total_height = (num + 1) * mt;
 	}