ScreenBranch shouldn't try to load a background

This commit is contained in:
Chris Danford
2004-12-11 09:50:09 +00:00
parent 104b18f820
commit 2185c82ff8
3 changed files with 16 additions and 11 deletions
+13 -11
View File
@@ -338,19 +338,21 @@ retry:
// Load shared BGAnimation
CString sNewBGA = THEME->GetPathToB(sScreenName+" background");
if( m_sLastLoadedBackground != sNewBGA )
if( pNewScreen->UsesBackground() )
{
// Create the new background before deleting the previous so that we keep
// any common textures loaded.
BGAnimation *pNewBGA = new BGAnimation;
pNewBGA->LoadFromAniDir( sNewBGA );
SAFE_DELETE( m_pSharedBGA );
m_pSharedBGA = pNewBGA;
CString sNewBGA = THEME->GetPathToB(sScreenName+" background");
if( m_sLastLoadedBackground != sNewBGA )
{
// Create the new background before deleting the previous so that we keep
// any common textures loaded.
BGAnimation *pNewBGA = new BGAnimation;
pNewBGA->LoadFromAniDir( sNewBGA );
SAFE_DELETE( m_pSharedBGA );
m_pSharedBGA = pNewBGA;
m_sLastLoadedBackground = sNewBGA;
}
m_sLastLoadedBackground = sNewBGA;
}
}
if( pOldTopScreen!=NULL && m_ScreenStack.back()!=pOldTopScreen )
{