diff options
| author | Paul Gilbert | 2014-10-31 19:44:45 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 22:18:21 -0500 |
| commit | e9c003f30648936e58253dca2e72173757d2ff80 (patch) | |
| tree | 612bc7b85b85a4399acb503c9ef16aeb68b2574d /engines/access/access.cpp | |
| parent | 374669d7c3d8b9d3b7207925c90417a4e82f7ed2 (diff) | |
| download | scummvm-rg350-e9c003f30648936e58253dca2e72173757d2ff80.tar.gz scummvm-rg350-e9c003f30648936e58253dca2e72173757d2ff80.tar.bz2 scummvm-rg350-e9c003f30648936e58253dca2e72173757d2ff80.zip | |
ACCESS: Fix display of paged text in doEstablish calls
Diffstat (limited to 'engines/access/access.cpp')
| -rw-r--r-- | engines/access/access.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/engines/access/access.cpp b/engines/access/access.cpp index a97bd6d322..051884c704 100644 --- a/engines/access/access.cpp +++ b/engines/access/access.cpp @@ -218,17 +218,20 @@ void AccessEngine::freeInactiveData() { _inactive._spritesPtr = nullptr; } -void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr) { +void AccessEngine::speakText(ASurface *s, const Common::String &msg) { + Common::String lines = msg; + Common::String line; int curPage = 0; int soundsLeft = 0; - while(true) { + for (;;) { soundsLeft = _countTbl[curPage]; _events->zeroKeys(); Common::String line; int width = 0; - bool lastLine = _fonts._font2.getLine(msgArr[curPage], s->_maxChars * 6, line, width); + bool lastLine = _fonts._font2.getLine(lines, s->_maxChars * 6, line, width); + // Set font colors _fonts._font2._fontColors[0] = 0; _fonts._font2._fontColors[1] = 28; @@ -308,11 +311,13 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr) } } -void AccessEngine::printText(ASurface *s, Common::String &msg) { +void AccessEngine::printText(ASurface *s, const Common::String &msg) { + Common::String lines = msg; Common::String line; int width = 0; - while (true) { - bool lastLine = _fonts._font2.getLine(msg, s->_maxChars * 6, line, width); + + for (;;) { + bool lastLine = _fonts._font2.getLine(lines, s->_maxChars * 6, line, width); // Set font colors _fonts._font2._fontColors[0] = 0; |