[Scummvm-git-logs] scummvm master -> 3242a3338ba3a793b6e2a578485a9597208f5115

athrxx noreply at scummvm.org
Sat Apr 29 14:57:01 UTC 2023


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:
3242a3338b KYRA: (EOB) - fix text glitch


Commit: 3242a3338ba3a793b6e2a578485a9597208f5115
    https://github.com/scummvm/scummvm/commit/3242a3338ba3a793b6e2a578485a9597208f5115
Author: athrxx (athrxx at scummvm.org)
Date: 2023-04-29T16:55:51+02:00

Commit Message:
KYRA: (EOB) - fix text glitch

Changed paths:
    engines/kyra/gui/gui_eob.cpp


diff --git a/engines/kyra/gui/gui_eob.cpp b/engines/kyra/gui/gui_eob.cpp
index 1f516c38a1f..06b637b00a6 100644
--- a/engines/kyra/gui/gui_eob.cpp
+++ b/engines/kyra/gui/gui_eob.cpp
@@ -4608,7 +4608,8 @@ void GUI_EoB::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int sp
 	if (bookPageIndex < 0)
 		return;
 
-	int x = _vm->_flags.lang == Common::ZH_TWN ? 4 + (bookPageIndex / 4) * 80 : 8;
+	int x1 = _vm->_flags.lang == Common::ZH_TWN ? 4 + (bookPageIndex / 4) * 80 : 8;
+	int x2 = _vm->_flags.lang == Common::ZH_TWN ? x1 : 6;
 	int y = _vm->_flags.lang == Common::ZH_TWN ? (bookPageIndex % 4) * 16 + 58 : bookPageIndex * 9 + 50;
 	int w = _vm->_flags.lang == Common::ZH_TWN ? 80 : 160;
 	int h = _vm->_flags.lang == Common::ZH_TWN ? 15 : 8;
@@ -4616,7 +4617,7 @@ void GUI_EoB::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int sp
 	_screen->set16bitShadingLevel(4);
 
 	if (!spellId || _vm->_flags.lang == Common::ZH_TWN)
-		_screen->fillRect(x, y, x + w, y + h,  _vm->guiSettings()->colors.fill);
+		_screen->fillRect(x2, y, x1 + w, y + h,  _vm->guiSettings()->colors.fill);
 
 	if (spellId) {
 		Common::String s;
@@ -4630,9 +4631,9 @@ void GUI_EoB::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int sp
 		}
 
 		if (noFill)
-			_screen->printText(s.c_str(), x, y, highLight ? _vm->guiSettings()->colors.guiColorLightRed : col1, 0);
+			_screen->printText(s.c_str(), x1, y, highLight ? _vm->guiSettings()->colors.guiColorLightRed : col1, 0);
 		else
-			_screen->printShadedText(s.c_str(), x, y, highLight ? _vm->guiSettings()->colors.guiColorLightRed : col1, _vm->guiSettings()->colors.fill, _vm->guiSettings()->colors.guiColorBlack);
+			_screen->printShadedText(s.c_str(), x1, y, highLight ? _vm->guiSettings()->colors.guiColorLightRed : col1, _vm->guiSettings()->colors.fill, _vm->guiSettings()->colors.guiColorBlack);
 	}
 
 	_screen->set16bitShadingLevel(0);




More information about the Scummvm-git-logs mailing list