Use CHECKPOINT_M instead of Checkpoint. It's simpler, faster and more reliable.
This commit is contained in:
@@ -66,7 +66,7 @@ void BannerCache::LoadBanner( CString BannerPath )
|
|||||||
if( m_BannerPathToImage.find(BannerPath) != m_BannerPathToImage.end() )
|
if( m_BannerPathToImage.find(BannerPath) != m_BannerPathToImage.end() )
|
||||||
return; /* already loaded */
|
return; /* already loaded */
|
||||||
|
|
||||||
Checkpoint( ssprintf( "BannerCache::LoadBanner: %s", CachePath.c_str() ) );
|
CHECKPOINT_M( ssprintf( "BannerCache::LoadBanner: %s", CachePath.c_str() ) );
|
||||||
SDL_Surface *img = mySDL_LoadSurface( CachePath );
|
SDL_Surface *img = mySDL_LoadSurface( CachePath );
|
||||||
if( img == NULL )
|
if( img == NULL )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ BitmapText::~BitmapText()
|
|||||||
|
|
||||||
bool BitmapText::LoadFromFont( CString sFontFilePath )
|
bool BitmapText::LoadFromFont( CString sFontFilePath )
|
||||||
{
|
{
|
||||||
Checkpoint( ssprintf("BitmapText::LoadFromFontName(%s)", sFontFilePath.c_str()) );
|
CHECKPOINT_M( ssprintf("BitmapText::LoadFromFontName(%s)", sFontFilePath.c_str()) );
|
||||||
|
|
||||||
if( m_pFont ) {
|
if( m_pFont ) {
|
||||||
FONT->UnloadFont( m_pFont );
|
FONT->UnloadFont( m_pFont );
|
||||||
@@ -105,7 +105,7 @@ bool BitmapText::LoadFromFont( CString sFontFilePath )
|
|||||||
|
|
||||||
bool BitmapText::LoadFromTextureAndChars( CString sTexturePath, CString sChars )
|
bool BitmapText::LoadFromTextureAndChars( CString sTexturePath, CString sChars )
|
||||||
{
|
{
|
||||||
Checkpoint( ssprintf("BitmapText::LoadFromTextureAndChars(\"%s\",\"%s\")", sTexturePath.c_str(), sChars.c_str()) );
|
CHECKPOINT_M( ssprintf("BitmapText::LoadFromTextureAndChars(\"%s\",\"%s\")", sTexturePath.c_str(), sChars.c_str()) );
|
||||||
|
|
||||||
if( m_pFont ) {
|
if( m_pFont ) {
|
||||||
FONT->UnloadFont( m_pFont );
|
FONT->UnloadFont( m_pFont );
|
||||||
|
|||||||
@@ -759,7 +759,7 @@ void Font::Load(const CString &sFontOrTextureFilePath, CString sChars)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* The font is not already loaded. Figure out what we have. */
|
/* The font is not already loaded. Figure out what we have. */
|
||||||
Checkpoint( ssprintf("Font::Load(\"%s\",\"%s\").", sFontOrTextureFilePath.c_str(), Chars.c_str()) );
|
CHECKPOINT_M( ssprintf("Font::Load(\"%s\",\"%s\").", sFontOrTextureFilePath.c_str(), Chars.c_str()) );
|
||||||
|
|
||||||
path = sFontOrTextureFilePath;
|
path = sFontOrTextureFilePath;
|
||||||
Chars = sChars;
|
Chars = sChars;
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ Font* FontManager::LoadFont( const CString &sFontOrTextureFilePath, CString sCha
|
|||||||
|
|
||||||
void FontManager::UnloadFont( Font *fp )
|
void FontManager::UnloadFont( Font *fp )
|
||||||
{
|
{
|
||||||
Checkpoint( ssprintf("FontManager::UnloadFont(%s).", fp->path.c_str()) );
|
CHECKPOINT_M( ssprintf("FontManager::UnloadFont(%s).", fp->path.c_str()) );
|
||||||
|
|
||||||
for( std::map<CString, Font*>::iterator i = m_mapPathToFont.begin();
|
for( std::map<CString, Font*>::iterator i = m_mapPathToFont.begin();
|
||||||
i != m_mapPathToFont.end(); ++i)
|
i != m_mapPathToFont.end(); ++i)
|
||||||
|
|||||||
Reference in New Issue
Block a user