aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-11-10 10:29:39 +0100
committerPaul Gilbert2014-12-12 22:29:02 -0500
commit26b632a9eb36f8e5e8874b50666b3d739dd1416f (patch)
tree2e93be0de235a6a4961ca1bb0b64d7bd17811eea
parent38edbfb4bcbdfe819a133ede25bd85b19d12df60 (diff)
downloadscummvm-rg350-26b632a9eb36f8e5e8874b50666b3d739dd1416f.tar.gz
scummvm-rg350-26b632a9eb36f8e5e8874b50666b3d739dd1416f.tar.bz2
scummvm-rg350-26b632a9eb36f8e5e8874b50666b3d739dd1416f.zip
ACCESS: Fix display in cmdDeath()
-rw-r--r--engines/access/access.cpp13
-rw-r--r--engines/access/font.cpp2
2 files changed, 7 insertions, 8 deletions
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index a1f6430965..b309e92b29 100644
--- 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
index ffc1715c39..5eaf0b0ca8 100644
--- 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