SCI: Fixed bug #3040161 - "LONGBOW: Textbox glitch"

GetLongest() could exceed the maximum width with the very last character of a word. The same fix has been applied to the SCI32 code.
scummvm · Mar 2, 2011 · b1055a3 · b1055a3
1 parent ba42c6f
commit b1055a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
@@ -337,6 +337,8 @@ static int16 GetLongest(const char *text, int16 maxWidth, GfxFont *font) {
 			maxChars = curCharCount; // return count up to (but not including) breaking space
 			break;
 		}
+		if (width + font->getCharWidth(curChar) > maxWidth)
+			break;
 		width += font->getCharWidth(curChar);
 		curCharCount++;
 	}

diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
@@ -204,6 +204,8 @@ int16 GfxText16::GetLongest(const char *text, int16 maxWidth, GuiResourceId orgF
 			maxChars = curCharCount; // return count up to (but not including) breaking space
 			break;
 		}
+		if (width + _font->getCharWidth(curChar) > maxWidth)
+			break;
 		width += _font->getCharWidth(curChar);
 		curCharCount++;
 	}