ACCESS: Fix getLine when \r occurs just after maximum line width reached

scummvm · Aug 31, 2014 · f8778a5 · f8778a5
1 parent b5b298a
commit f8778a5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
@@ -74,6 +74,9 @@ void Font::load(const int *fontIndex, const byte *fontData) {
 }
 
 int Font::charWidth(char c) {
+	if (c < ' ')
+		return 0;
+
 	return _chars[c - ' '].w;
 }
 
@@ -95,7 +98,7 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 	while ((c = *src) != '\0') {
 		if (c == '\r') {
 			// End of line, so return calculated line
-			line = Common::String(s.c_str(), src - 1);
+			line = Common::String(s.c_str(), src);
 			s = Common::String(src + 1);
 			return false;
 		}