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

fix assert when switching from rave to arcade

Browse Source
This commit is contained in:
Chris Danford
2004-05-02 22:18:07 +00:00
parent 51f0b44483
commit 9d321a5bb7
1 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+13 -20
View File
@@ -301,9 +301,8 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme
m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); // invisible m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); // invisible
//this->AddChild( &m_sprOptionsMessage ); // we have to draw this manually over the top of transitions //this->AddChild( &m_sprOptionsMessage ); // we have to draw this manually over the top of transitions
for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsPlayerEnabled( p )) FOREACH_PlayerNumber( p )
{ {
m_sprNonPresence[p].SetName( ssprintf("NonPresenceP%d",p+1) ); m_sprNonPresence[p].SetName( ssprintf("NonPresenceP%d",p+1) );
m_sprNonPresence[p].Load( THEME->GetPathToG(ssprintf("ScreenSelectMusic nonpresence p%d",p+1)) ); m_sprNonPresence[p].Load( THEME->GetPathToG(ssprintf("ScreenSelectMusic nonpresence p%d",p+1)) );
@@ -378,25 +377,22 @@ void ScreenSelectMusic::TweenSongPartsOnScreen( bool Initial )
// m_DifficultyList.Show(); // m_DifficultyList.Show();
} }
int p;
for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsHumanPlayer(p) ) FOREACH_HumanPlayer( p )
continue; // skip {
ON_COMMAND( m_sprDifficultyFrame[p] ); ON_COMMAND( m_sprDifficultyFrame[p] );
ON_COMMAND( m_sprMeterFrame[p] ); ON_COMMAND( m_sprMeterFrame[p] );
ON_COMMAND( m_DifficultyIcon[p] ); ON_COMMAND( m_DifficultyIcon[p] );
ON_COMMAND( m_AutoGenIcon[p] ); ON_COMMAND( m_AutoGenIcon[p] );
} }
}
for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( GAMESTATE->IsPlayerEnabled(p) ) FOREACH_PlayerNumber( p )
continue; // skip {
ON_COMMAND( m_sprNonPresence[p] ); ON_COMMAND( m_sprNonPresence[p] );
} }
}
} }
void ScreenSelectMusic::TweenSongPartsOffScreen( bool Final ) void ScreenSelectMusic::TweenSongPartsOffScreen( bool Final )
@@ -414,25 +410,22 @@ void ScreenSelectMusic::TweenSongPartsOffScreen( bool Final )
m_DifficultyList.Hide(); m_DifficultyList.Hide();
} }
int p;
for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( !GAMESTATE->IsHumanPlayer(p) ) FOREACH_HumanPlayer( p )
continue; // skip {
OFF_COMMAND( m_sprDifficultyFrame[p] ); OFF_COMMAND( m_sprDifficultyFrame[p] );
OFF_COMMAND( m_sprMeterFrame[p] ); OFF_COMMAND( m_sprMeterFrame[p] );
OFF_COMMAND( m_DifficultyIcon[p] ); OFF_COMMAND( m_DifficultyIcon[p] );
OFF_COMMAND( m_AutoGenIcon[p] ); OFF_COMMAND( m_AutoGenIcon[p] );
} }
}
for( p=0; p<NUM_PLAYERS; p++ )
{ {
if( GAMESTATE->IsPlayerEnabled( p )) FOREACH_PlayerNumber( p )
continue; // skip {
OFF_COMMAND( m_sprNonPresence[p] ); OFF_COMMAND( m_sprNonPresence[p] );
} }
}
} }
void ScreenSelectMusic::TweenCoursePartsOnScreen( bool Initial ) void ScreenSelectMusic::TweenCoursePartsOnScreen( bool Initial )