actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix wrong background loaded after a ScreenBranch

Browse Source
This commit is contained in:
Chris Danford
2004-12-11 09:54:08 +00:00
parent 2185c82ff8
commit 8da1e887f4
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
+19 -17
View File
@@ -337,23 +337,6 @@ retry:
pNewScreen = MakeNewScreen(sScreenName); pNewScreen = MakeNewScreen(sScreenName);
// Load shared BGAnimation
if( pNewScreen->UsesBackground() )
{
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;
}
}
if( pOldTopScreen!=NULL && m_ScreenStack.back()!=pOldTopScreen ) if( pOldTopScreen!=NULL && m_ScreenStack.back()!=pOldTopScreen )
{ {
// While constructing this Screen, it's constructor called // While constructing this Screen, it's constructor called
@@ -371,10 +354,29 @@ retry:
goto retry; goto retry;
} }
// Load shared BGAnimation
if( m_ScreenStack.back()->UsesBackground() )
{
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;
}
}
bool bWasOnSystemMenu = GAMESTATE->m_bIsOnSystemMenu; bool bWasOnSystemMenu = GAMESTATE->m_bIsOnSystemMenu;
/* If this is a system menu, don't let the operator key touch it! /* If this is a system menu, don't let the operator key touch it!
However, if you add an options screen, please include it here -- Miryokuteki */ However, if you add an options screen, please include it here -- Miryokuteki */
/* TODO: Don't have a hard-coded list of system menu names. Make it a property
* of the Screen. */
if( sScreenName == "ScreenOptionsMenu" || if( sScreenName == "ScreenOptionsMenu" ||
sScreenName == "ScreenMachineOptions" || sScreenName == "ScreenMachineOptions" ||
sScreenName == "ScreenInputOptions" || sScreenName == "ScreenInputOptions" ||