[Scummvm-git-logs] scummvm master -> 2a5602f34db9056ebd66d70d6db10b0cce907aae

[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:
2a5602f34d GRAPHICS: MACGUI: Fix blank characters on forced Win95 mode


Commit: 2a5602f34db9056ebd66d70d6db10b0cce907aae
    https://github.com/scummvm/scummvm/commit/2a5602f34db9056ebd66d70d6db10b0cce907aae
Author: Niv Baehr (bloop93 at gmail.com)
Date: 2024-11-05T20:18:50+01:00

Commit Message:
GRAPHICS: MACGUI: Fix blank characters on forced Win95 mode

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 997ff1605f3..2ec214dbc79 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -534,7 +534,7 @@ const Font *MacFontManager::getFont(MacFont *macFont) {
 				int newId = macFont->getId();
 				int newSlant = macFont->getSlant();
 				int familyId = getFamilyId(newId, newSlant);
-				if (_fontInfo.contains(familyId)) {
+				if (_fontInfo.contains(familyId) && !(_mode & kWMModeForceMacFontsInWin95)) {
 					font = Graphics::loadTTFFontFromArchive(_fontInfo[familyId]->name, macFont->getSize(), Graphics::kTTFSizeModeCharacter, 0, 0, Graphics::kTTFRenderModeMonochrome);
 					_uniFonts[macFont->getSize()] = font;
 				} else {