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

un-revert commit that works just fine for me, and was reverted with no

Browse Source 
attempt to explain what broke.

Ben, every remark and commit from you is rude and derisive, and this
project doesn't need that.  You've expended my patience.  If you refuse
to be civil, leave.
This commit is contained in:
Glenn Maynard
2005-07-07 01:32:15 +00:00
parent d05e819187
commit 378295df84
1 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
+62 -21
View File
@@ -296,19 +296,45 @@ void ScreenManager::PrepareScreen( const CString &sScreenName )
{
m_bZeroNextUpdate = true;
// Delete previously prepared versions of the screen.
// If the screen is already prepared, stop.
for( int i = (int)m_vPreparedScreens.size()-1; i>=0; i-- )
{
Screen *&pScreen = m_vPreparedScreens[i];
if( pScreen->m_sName == sScreenName )
{
SAFE_DELETE( pScreen );
m_vPreparedScreens.erase( m_vPreparedScreens.begin()+i );
break;
}
return;
}
m_vPreparedScreens.push_back( MakeNewScreen(sScreenName) );
Screen* pNewScreen = MakeNewScreen(sScreenName);
m_vPreparedScreens.push_back( pNewScreen );
/* Don't delete previously prepared versions of the screen's background,
* and only prepare it if it's different than the current background
* and not already loaded. */
CString sNewBGA;
if( pNewScreen->UsesBackground() )
sNewBGA = THEME->GetPathB(sScreenName,"background");
if( !sNewBGA.empty() && sNewBGA != m_pSharedBGA->GetName() )
{
Actor *pNewBGA = NULL;
FOREACH( Actor*, m_vPreparedBackgrounds, a )
{
if( (*a)->m_sName == sNewBGA )
{
pNewBGA = *a;
break;
}
}
// Create the new background before deleting the previous so that we keep
// any common textures loaded.
if( pNewBGA == NULL )
{
pNewBGA = ActorUtil::MakeActor( sNewBGA );
pNewBGA->SetName( sNewBGA );
m_vPreparedBackgrounds.push_back( pNewBGA );
}
}
}
void ScreenManager::DeletePreparedScreens()
@@ -318,6 +344,9 @@ void ScreenManager::DeletePreparedScreens()
FOREACH( Screen*, m_vPreparedScreens, s )
SAFE_DELETE( *s );
m_vPreparedScreens.clear();
FOREACH( Actor*, m_vPreparedBackgrounds, a )
SAFE_DELETE( *a );
m_vPreparedBackgrounds.clear();
TEXTUREMAN->DeleteCachedTextures();
}
@@ -370,14 +399,15 @@ void ScreenManager::LoadDelayedScreen()
EmptyDeleteQueue();
}
retry:
CString sScreenName = m_sDelayedScreen;
m_sDelayedScreen = "";
// Load the screen, if it's not already prepared.
PrepareScreen( sScreenName );
//
// Search prepped screens to see if we already have this screen available.
// If not prepped, then make it.
// Find the prepped screen.
//
Screen* pNewScreen = NULL;
FOREACH( Screen*, m_vPreparedScreens, s )
@@ -389,32 +419,43 @@ retry:
break;
}
}
if( pNewScreen == NULL )
pNewScreen = MakeNewScreen(sScreenName);
ASSERT( pNewScreen != NULL );
if( m_sDelayedScreen != "" )
{
// While constructing this Screen, it's constructor called
// While constructing this Screen, its constructor called
// SetNewScreen again! That SetNewScreen Command should
// override this older one.
SAFE_DELETE( pNewScreen );
goto retry;
// This is no longer allowed. Instead, figure out which screen
// you really wanted in the first place with Lua, and don't waste
// time constructing an extra screen.
FAIL_M( ssprintf("%s, %s", sScreenName.c_str(), m_sDelayedScreen.c_str()) );
}
// Load shared background
// Find the prepared shared background (if any), and activate it.
CString sNewBGA;
if( pNewScreen->UsesBackground() )
sNewBGA = THEME->GetPathB(sScreenName,"background");
if( sNewBGA != m_pSharedBGA->GetName() )
{
// Create the new background before deleting the previous so that we keep
// any common textures loaded.
Actor *pNewBGA;
Actor *pNewBGA = NULL;
if( sNewBGA.empty() )
pNewBGA = new Actor;
else
pNewBGA = ActorUtil::MakeActor( sNewBGA );
pNewBGA->SetName( sNewBGA );
{
FOREACH( Actor*, m_vPreparedBackgrounds, a )
{
if( (*a)->m_sName == sNewBGA )
{
pNewBGA = *a;
m_vPreparedBackgrounds.erase( a );
break;
}
}
}
ASSERT( pNewBGA != NULL );
SAFE_DELETE( m_pSharedBGA );
m_pSharedBGA = pNewBGA;