[Scummvm-git-logs] scummvm master -> 61ff29468e64970060e3ce708aeaff2782e47257

[athrxx]

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:
61ff29468e KYRA: (EOB/PC98) - fix spellbook text


Commit: 61ff29468e64970060e3ce708aeaff2782e47257
    https://github.com/scummvm/scummvm/commit/61ff29468e64970060e3ce708aeaff2782e47257
Author: athrxx (athrxx at scummvm.org)
Date: 2023-07-03T18:34:14+02:00

Commit Message:
KYRA: (EOB/PC98) - fix spellbook text

Changed paths:
    engines/kyra/graphics/screen.cpp


diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index 3266e6ad2aa..3e86b55f7e9 100644
--- a/engines/kyra/graphics/screen.cpp
+++ b/engines/kyra/graphics/screen.cpp
@@ -1567,12 +1567,12 @@ void Screen::printText(const char *str, int x, int y, uint8 color1, uint8 color2
 
 uint16 Screen::fetchChar(const char *&s) const {
 	const int fontType = _fonts[_currentFont]->getType();
-	if (fontType == Font::kASCII || fontType == Font::kJIS_X0201)
+	if (fontType == Font::kASCII)
 		return (uint8)*s++;
 
 	uint16 ch = (uint8)*s++;
 
-	if ((fontType == Font::kSJIS && (ch <= 0x7F || (ch >= 0xA1 && ch <= 0xDF))) ||
+	if (((fontType == Font::kSJIS || fontType == Font::kJIS_X0201) && (ch <= 0x7F || (ch >= 0xA1 && ch <= 0xDF))) ||
 		((fontType == Font::kBIG5 || fontType == Font::kJohab) && ch < 0x80))
 			return ch;