git-svn-id: https://openitg.svn.sourceforge.net/svnroot/openitg@381 83fadc84-e282...

diff --git a/src/FontManager.cpp b/src/FontManager.cpp
index f38f9fe..4fd0f6e 100755 (executable)
--- a/src/FontManager.cpp
+++ b/src/FontManager.cpp
@@ -38,6 +38,12 @@ void FontManager::ReloadFonts()
        }
 }
 
+Font *FontManager::CopyFont( Font *pFont )
+{
+        ++pFont->m_iRefCount;
+        return pFont;
+}
+
 Font* FontManager::LoadFont( const CString &sFontOrTextureFilePath, CString sChars )
 {
        // Convert the path to lowercase so that we don't load duplicates.
@@ -45,7 +51,7 @@ Font* FontManager::LoadFont( const CString &sFontOrTextureFilePath, CString sCha
        // of the same bitmap if there are equivalent but different paths
        // (e.g. "graphics\blah.png" and "..\stepmania\graphics\blah.png" ).
 
-       CHECKPOINT_M( ssprintf("FontManager::LoadFont(%s).", sFontOrTextureFilePath.c_str()) );
+       //CHECKPOINT_M( ssprintf("FontManager::LoadFont(%s).", sFontOrTextureFilePath.c_str()) );
        const FontName NewName( sFontOrTextureFilePath, sChars );
        map<FontName, Font*>::iterator p = g_mapPathToFont.find( NewName );
        if( p != g_mapPathToFont.end() )
@@ -58,13 +64,14 @@ Font* FontManager::LoadFont( const CString &sFontOrTextureFilePath, CString sCha
        Font *f = new Font;
        f->Load(sFontOrTextureFilePath, sChars);
        g_mapPathToFont[NewName] = f;
+
        return f;
 }
 
 
 void FontManager::UnloadFont( Font *fp )
 {
-       CHECKPOINT_M( ssprintf("FontManager::UnloadFont(%s).", fp->path.c_str()) );
+       //CHECKPOINT_M( ssprintf("FontManager::UnloadFont(%s) %d.", fp->path.c_str(), fp->path.length() ));
 
        for( std::map<FontName, Font*>::iterator i = g_mapPathToFont.begin();
                i != g_mapPathToFont.end(); ++i)
@@ -81,7 +88,7 @@ void FontManager::UnloadFont( Font *fp )
                }
                return;
        }
-       
+
        RageException::Throw( "Unloaded an unknown font (%p)", fp );
 }
 

diff --git a/src/FontManager.h b/src/FontManager.h
index f4e7ce8..5fe9afa 100755 (executable)
--- a/src/FontManager.h
+++ b/src/FontManager.h
@@ -13,6 +13,7 @@ public:
        ~FontManager();
 
        Font* LoadFont( const CString &sFontOrTextureFilePath, CString sChars = "" );
+       Font *CopyFont( Font *pFont );
        void UnloadFont( Font *fp );
 
        /* Warning: This reloads fonts completely, so all BitmapTexts need to be