diff options
| author | Einar Johan Trøan Sømåen | 2012-07-06 19:21:46 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-06 19:21:46 +0200 |
| commit | eaa5f2e41531cca8801ae3ec77882f8f7c4565e5 (patch) | |
| tree | d61c4a32e042e254cb1caceb2f2e4acd0532f448 /engines | |
| parent | a9f0852e2daaca84204186dd91f6d85b3bf40963 (diff) | |
| download | scummvm-rg350-eaa5f2e41531cca8801ae3ec77882f8f7c4565e5.tar.gz scummvm-rg350-eaa5f2e41531cca8801ae3ec77882f8f7c4565e5.tar.bz2 scummvm-rg350-eaa5f2e41531cca8801ae3ec77882f8f7c4565e5.zip | |
WINTERMUTE: Clean out the FreeType-initialization-code from BFontStorage.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/wintermute/Base/BFontStorage.cpp | 20 | ||||
| -rw-r--r-- | engines/wintermute/Base/BFontStorage.h | 8 |
2 files changed, 0 insertions, 28 deletions
diff --git a/engines/wintermute/Base/BFontStorage.cpp b/engines/wintermute/Base/BFontStorage.cpp index 0ec51b1317..3749161137 100644 --- a/engines/wintermute/Base/BFontStorage.cpp +++ b/engines/wintermute/Base/BFontStorage.cpp @@ -43,27 +43,13 @@ IMPLEMENT_PERSISTENT(CBFontStorage, true) //////////////////////////////////////////////////////////////////////////
CBFontStorage::CBFontStorage(CBGame *inGame): CBBase(inGame) {
-// _fTLibrary = NULL;
- initFreeType();
}
-
//////////////////////////////////////////////////////////////////////////
CBFontStorage::~CBFontStorage() {
cleanup(true);
}
-
-//////////////////////////////////////////////////////////////////////////
-void CBFontStorage::initFreeType() {
-#if 0
- FT_Error error = FT_Init_FreeType(&_fTLibrary);
- if (error) {
- Game->LOG(0, "Error initializing FreeType library.");
- }
-#endif
-}
-
//////////////////////////////////////////////////////////////////////////
HRESULT CBFontStorage::cleanup(bool warn) {
for (int i = 0; i < _fonts.GetSize(); i++) {
@@ -72,10 +58,6 @@ HRESULT CBFontStorage::cleanup(bool warn) { }
_fonts.RemoveAll();
-#if 0
- if (_fTLibrary) FT_Done_FreeType(_fTLibrary);
-#endif
-
return S_OK;
}
@@ -147,8 +129,6 @@ HRESULT CBFontStorage::persist(CBPersistMgr *persistMgr) { persistMgr->transfer(TMEMBER(Game));
_fonts.persist(persistMgr);
- if (!persistMgr->_saving) initFreeType();
-
return S_OK;
}
diff --git a/engines/wintermute/Base/BFontStorage.h b/engines/wintermute/Base/BFontStorage.h index bbbcf529c2..e5f96fd3bc 100644 --- a/engines/wintermute/Base/BFontStorage.h +++ b/engines/wintermute/Base/BFontStorage.h @@ -48,14 +48,6 @@ public: virtual ~CBFontStorage();
CBArray<CBFont *, CBFont *> _fonts;
HRESULT initLoop();
-
- /* FT_Library GetFTLibrary() const {
- return _fTLibrary;
- }*/
-
-private:
- void initFreeType();
- //FT_Library _fTLibrary;
};
} // end of namespace WinterMute
|