HOPKINS: Move font initialization to FontsManager

scummvm · Feb 15, 2013 · d1a19a1 · d1a19a1
1 parent 4c1047c
commit d1a19a1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp
@@ -71,6 +71,12 @@ void FontManager::clearAll() {
 	_tempText = g_PTRNUL;
 }
 
+void FontManager::initData() {
+	_font = _vm->_fileManager.loadFile("FONTE3.SPR");
+	_fontFixedWidth = 12;
+	_fontFixedHeight = 21;
+
+}
 /**
  * Display Text
  */

diff --git a/engines/hopkins/font.h b/engines/hopkins/font.h
@@ -78,8 +78,9 @@ class FontManager {
 	FontManager();
 	~FontManager();
 	void setParent(HopkinsEngine *vm);
-
 	void clearAll();
+	void initData();
+
 	void showText(int idx);
 	void hideText(int idx);
 	void initTextBuffers(int idx, int messageId, const Common::String &filename, int xp, int yp, int textType, int length, int color);

diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
@@ -1557,13 +1557,11 @@ void HopkinsEngine::initializeSystem() {
 	SearchMan.addSubDirectoryMatching(gameDataDir, "VOICE");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "TSVGA");
 
-	_eventsManager.initMouseData();
-
 	_globals.clearAll();
 
-	_fontManager._font = _fileManager.loadFile("FONTE3.SPR");
-	_fontManager._fontFixedWidth = 12;
-	_fontManager._fontFixedHeight = 21;
+	_eventsManager.initMouseData();
+	_fontManager.initData();
+
 	_dialogsManager._inventoryIcons = _fileManager.loadFile("ICONE.SPR");
 	_objectsManager._headSprites = _fileManager.loadFile("TETE.SPR");