[Scummvm-git-logs] scummvm master -> 3a167d59269a2f00422bd02e0ac76366dd77fc9e

[eriktorbjorn]

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:
3a167d5926 SCUMM: Remove leftover MacFontManager


Commit: 3a167d59269a2f00422bd02e0ac76366dd77fc9e
    https://github.com/scummvm/scummvm/commit/3a167d59269a2f00422bd02e0ac76366dd77fc9e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-03-03T16:25:15+01:00

Commit Message:
SCUMM: Remove leftover MacFontManager

All access to the Mac font manager is now done through _macGui, and even
that doesn't have its own instance of it since it's part of the Mac
window manager.

Changed paths:
    engines/scumm/scumm.cpp
    engines/scumm/scumm.h


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 3562f8f312c..c4787408e87 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -440,7 +440,6 @@ ScummEngine::~ScummEngine() {
 	for (int i = 0; i < 20; i++)
 		if (_2byteMultiFontPtr[i])
 			delete _2byteMultiFontPtr[i];
-	delete _macFontManager;
 	delete _charset;
 	delete _messageDialog;
 	delete _pauseDialog;
@@ -1636,7 +1635,6 @@ void ScummEngine::setupCharsetRenderer(const Common::Path &macFontFile) {
 		if (_game.platform == Common::kPlatformFMTowns)
 			_charset = new CharsetRendererTownsV3(this);
 		else if (_game.platform == Common::kPlatformMacintosh && !macFontFile.empty()) {
-			_macFontManager = new Graphics::MacFontManager(0, Common::Language::UNK_LANG);
 			_charset = new CharsetRendererMac(this, macFontFile);
 		} else
 			_charset = new CharsetRendererV3(this);
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 36b534f551d..3821e6cbbc3 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -67,7 +67,6 @@ class SeekableWriteStream;
 }
 namespace Graphics {
 class FontSJIS;
-class MacFontManager;
 }
 
 /**
@@ -1587,7 +1586,6 @@ public:
 	Graphics::Surface _textSurface;
 	int _textSurfaceMultiplier = 0;
 
-	Graphics::MacFontManager *_macFontManager = nullptr;
 	Graphics::Surface *_macScreen = nullptr;
 	MacGui *_macGui = nullptr;