diff options
Diffstat (limited to 'engines/lure')
-rw-r--r-- | engines/lure/surface.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp index a093142964..64b7be9b1b 100644 --- a/engines/lure/surface.cpp +++ b/engines/lure/surface.cpp @@ -263,11 +263,16 @@ void Surface::writeSubstring(uint16 x, uint16 y, Common::String line, int len, colour = LureEngine::getReference().isEGA() ? EGA_DIALOG_TEXT_COLOUR : VGA_DIALOG_TEXT_COLOUR; for (int index = 0; (index < len) && (*sPtr != '\0'); ++index, ++sPtr) { + int charSize = varLength ? fontSize[(uint8)*sPtr - 32] + 2 : FONT_WIDTH; + if (x + charSize >= width()) + // Passed the right hand edge of the surface + break; + + // Write next character writeChar(x, y, (uint8) *sPtr, transparent, colour); // Move to after the character in preparation for the next character - if (!varLength) x += FONT_WIDTH; - else x += fontSize[(uint8)*sPtr - 32] + 2; + x += charSize; } } |