[Scummvm-git-logs] scummvm master -> 9fced11fb4aff7b6515769eafc298ab404658e72

[bluegr]

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

Summary:
9d4ac18be5 COMMON: macText::plainByteMode() accounts for Mac Roman.
e0a77dcae5 PINK: Director supports hebrew font from macMenu.
8c3b8a07c0 JANITORIAL: Fix formatting on if statement
9fced11fb4 PINK: Remove redundant alignment code in action_text.


Commit: 9d4ac18be542eed5fdbb52519fd95ea7ac47a9e4
    https://github.com/scummvm/scummvm/commit/9d4ac18be542eed5fdbb52519fd95ea7ac47a9e4
Author: Quote58 (michael.hayman54 at gmail.com)
Date: 2022-04-18T16:26:57+03:00

Commit Message:
COMMON: macText::plainByteMode() accounts for Mac Roman.

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index bb0fd4dc3e7..5855fda541b 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -76,7 +76,9 @@ Common::CodePage MacFontRun::getEncoding() {
 
 bool MacFontRun::plainByteMode() {
 	Common::CodePage encoding = getEncoding();
-	return encoding != Common::kUtf8 && encoding != Common::kCodePageInvalid;
+	// This return statement accounts for utf8, invalid, and Mac Roman.
+	// For future Unicode font compatibility, it should account for all codepages instead.
+	return encoding != Common::kUtf8 && encoding != Common::kCodePageInvalid && encoding != Common::kMacRoman;
 }
 
 Common::String MacFontRun::getEncodedText() {


Commit: e0a77dcae5c7da733815f200a506ea5927f054ff
    https://github.com/scummvm/scummvm/commit/e0a77dcae5c7da733815f200a506ea5927f054ff
Author: Quote58 (michael.hayman54 at gmail.com)
Date: 2022-04-18T16:26:57+03:00

Commit Message:
PINK: Director supports hebrew font from macMenu.

Changed paths:
    engines/pink/director.cpp


diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp
index 085f6937004..2708609f7fb 100644
--- a/engines/pink/director.cpp
+++ b/engines/pink/director.cpp
@@ -108,7 +108,11 @@ Director::Director(PinkEngine *vm)
 	_textFont = nullptr;
 
 #ifdef USE_FREETYPE2
-	_textFont = Graphics::loadTTFFontFromArchive("system.ttf", 16);
+	if (vm->getLanguage() == Common::HE_ISR) {
+		_textFont = _wm->_fontMan->getFont(Graphics::MacFont(Graphics::kMacFontChicago, 12, Graphics::kMacFontRegular));
+	} else {
+	  _textFont = Graphics::loadTTFFontFromArchive("system.ttf", 16);
+	}
 #endif
 	_textFontCleanup = true;
 


Commit: 8c3b8a07c0012d1626d3420daaaabab61ff45233
    https://github.com/scummvm/scummvm/commit/8c3b8a07c0012d1626d3420daaaabab61ff45233
Author: Quote58 (michael.hayman54 at gmail.com)
Date: 2022-04-18T16:26:57+03:00

Commit Message:
JANITORIAL: Fix formatting on if statement

Changed paths:
    engines/pink/director.cpp


diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp
index 2708609f7fb..950ae771e08 100644
--- a/engines/pink/director.cpp
+++ b/engines/pink/director.cpp
@@ -111,7 +111,7 @@ Director::Director(PinkEngine *vm)
 	if (vm->getLanguage() == Common::HE_ISR) {
 		_textFont = _wm->_fontMan->getFont(Graphics::MacFont(Graphics::kMacFontChicago, 12, Graphics::kMacFontRegular));
 	} else {
-	  _textFont = Graphics::loadTTFFontFromArchive("system.ttf", 16);
+		_textFont = Graphics::loadTTFFontFromArchive("system.ttf", 16);
 	}
 #endif
 	_textFontCleanup = true;


Commit: 9fced11fb4aff7b6515769eafc298ab404658e72
    https://github.com/scummvm/scummvm/commit/9fced11fb4aff7b6515769eafc298ab404658e72
Author: Quote58 (michael.hayman54 at gmail.com)
Date: 2022-04-18T16:26:57+03:00

Commit Message:
PINK: Remove redundant alignment code in action_text.

Changed paths:
    engines/pink/objects/actions/action_text.cpp


diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index edf10a4b5df..94a29fe7c7d 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -142,12 +142,7 @@ void ActionText::start() {
 	} else {
 		director->addTextAction(this);
 
-		// alignment not working, thus we implement alignment for center manually
-		Graphics::TextAlign alignment = _centered ? Graphics::kTextAlignCenter : Graphics::kTextAlignLeft;
-		if (!_centered && _actor->getPage()->getGame()->getLanguage() == Common::HE_ISR) {
-			alignment = Graphics::kTextAlignRight;
-		}
-		_macText = new Graphics::MacText(_text, &director->getWndManager(), director->getTextFont(), _textColorIndex, _backgroundColorIndex, _xRight - _xLeft, alignment);
+		_macText = new Graphics::MacText(_text, &director->getWndManager(), director->getTextFont(), _textColorIndex, _backgroundColorIndex, _xRight - _xLeft, align);
 	}
 }