[Scummvm-git-logs] scummvm master -> 289dfabb4298b5aaee01ce356eea850d345121ca

[sev-]

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:
289dfabb42 MACGUI: Encode UTF-8 in windows mode


Commit: 289dfabb4298b5aaee01ce356eea850d345121ca
    https://github.com/scummvm/scummvm/commit/289dfabb4298b5aaee01ce356eea850d345121ca
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2023-06-29T09:50:04+03:00

Commit Message:
MACGUI: Encode UTF-8 in windows mode

This fixes hebrew rendering of PDA in Pink
also reverts commit 2fe812db972b5ccfe5034142be3273db313b1e8f.

Changed paths:
    engines/pink/objects/actions/action_text.cpp
    graphics/macgui/mactext.cpp


diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index 5036611f1ae..0d5551d57e5 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -122,7 +122,7 @@ void ActionText::start() {
 		break;
 
 	case Common::HE_ISR:
-		_text = Common::String(str).decode(Common::kWindows1251);
+		_text = Common::String(str).decode(Common::kWindows1255);
 		if (!_centered) {
 			align = Graphics::kTextAlignRight;
 		}
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 4aa1c3fe386..9232e058166 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -71,6 +71,8 @@ bool MacFontRun::equals(MacFontRun &to) {
 }
 
 Common::CodePage MacFontRun::getEncoding() {
+	if (wm->_mode & kWMModeWin95)
+		return Common::kUtf8;
 	return wm->_fontMan->getFontEncoding(fontId);
 }