ACCESS: Fix display in cmdDeath()

scummvm · Dec 13, 2014 · 26b632a · 26b632a
1 parent 38edbfb
commit 26b632a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
@@ -325,16 +325,15 @@ void AccessEngine::printText(ASurface *s, const Common::String &msg) {
 		_fonts._font2._fontColors[1] = 28;
 		_fonts._font2._fontColors[2] = 29;
 		_fonts._font2._fontColors[3] = 30;
-
 		_fonts._font2.drawString(s, line, s->_printOrg);
-		s->_printOrg = Common::Point(s->_printStart.x, s->_printOrg.y + 9);
 
-		if (lastLine)
-			break;
+		s->_printOrg = Common::Point(s->_printStart.x, s->_printOrg.y + 9);
 
-		_events->waitKeyMouse();
-		_buffer2.copyBuffer(s);
-		s->_printOrg.y = s->_printStart.y;
+		if (s->_printOrg.y >_printEnd && !lastLine) {
+			_events->waitKeyMouse();
+			s->copyBuffer(&_buffer2);
+			s->_printOrg.y = s->_printStart.y;
+		}
 
 		if (lastLine)
 			break;

diff --git a/engines/access/font.cpp b/engines/access/font.cpp
@@ -111,7 +111,7 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 		// Reached maximum allowed size
 		// If this was the last character of the string, let it go
 		if (*src == '\0')
-			break;
+			return true;
 
 		// Work backwards to find space at the start of the current word 
 		// as a point to split the line on