[Scummvm-git-logs] scummvm master -> 8fffd48ed1a054c8ecf3776b6e026d6b89b90022

[AndywinXp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8fffd48ed1 SCUMM: v7-8: Apply e94d467 only for non-_newStyle text rendering


Commit: 8fffd48ed1a054c8ecf3776b6e026d6b89b90022
    https://github.com/scummvm/scummvm/commit/8fffd48ed1a054c8ecf3776b6e026d6b89b90022
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-07-17T14:57:57+02:00

Commit Message:
SCUMM: v7-8: Apply e94d467 only for non-_newStyle text rendering

Changed paths:
    engines/scumm/string_v7.cpp


diff --git a/engines/scumm/string_v7.cpp b/engines/scumm/string_v7.cpp
index fe03619a76b..0f031d12841 100644
--- a/engines/scumm/string_v7.cpp
+++ b/engines/scumm/string_v7.cpp
@@ -226,7 +226,7 @@ void TextRenderer_v7::drawString(const char *str, byte *buffer, Common::Rect &cl
 	clipRect.left = (flags & kStyleAlignCenter) ? x - maxWidth / 2 : ((flags & kStyleAlignRight) ? x - maxWidth : x);
 	clipRect.right = MIN<int>(clipRect.right, clipRect.left + maxWidth);
 	clipRect.top = y2;
-	clipRect.bottom = y + 1;
+	clipRect.bottom = y + (_newStyle ? 0 : 1);
 }
 
 void TextRenderer_v7::drawStringWrap(const char *str, byte *buffer, Common::Rect &clipRect, int x, int y, int pitch, int16 col, TextStyleFlags flags) {
@@ -377,7 +377,7 @@ void TextRenderer_v7::drawStringWrap(const char *str, byte *buffer, Common::Rect
 	clipRect.left = (flags & kStyleAlignCenter) ? x - maxWidth / 2 : ((flags & kStyleAlignRight) ? x - maxWidth : x);
 	clipRect.right = MIN<int>(clipRect.right, clipRect.left + maxWidth);
 	clipRect.top = y2;
-	clipRect.bottom = y + 1;
+	clipRect.bottom = y + (_newStyle ? 0 : 1);
 }
 
 Common::Rect TextRenderer_v7::calcStringDimensions(const char *str, int x, int y, TextStyleFlags flags) {