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

OffFocused/OffUnfocused for sprPreview

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-05 21:34:14 +00:00
parent 398d8c2bbe
commit 8382619231
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMaster.cpp
+12 -9
View File
@@ -553,32 +553,35 @@ float ScreenSelectMaster::TweenOffScreen()
if( GetPage(c) != GetCurrentPage() ) if( GetPage(c) != GetCurrentPage() )
continue; // skip continue; // skip
bool SelectedByEitherPlayer = false;
for( int p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsPlayerEnabled(p) && m_iChoice[p] == (int)c )
SelectedByEitherPlayer = true;
for( int i=0; i<NUM_ICON_PARTS; i++ ) for( int i=0; i<NUM_ICON_PARTS; i++ )
{ {
fSecs = max( fSecs, OFF_COMMAND( m_sprIcon[i][c] ) ); fSecs = max( fSecs, OFF_COMMAND( m_sprIcon[i][c] ) );
bool SelectedByEitherPlayer = false; fSecs = max( fSecs, COMMAND( m_sprIcon[i][c], SelectedByEitherPlayer? "OffFocused":"OffUnfocused" ) );
for( int p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsPlayerEnabled(p) && m_iChoice[p] == (int)c )
SelectedByEitherPlayer = true;
if( SelectedByEitherPlayer )
fSecs = max( fSecs, COMMAND( m_sprIcon[i][c], "OffFocused" ) );
else
fSecs = max( fSecs, COMMAND( m_sprIcon[i][c], "OffUnfocused" ) );
} }
if( SHARED_PREVIEW_AND_CURSOR ) if( SHARED_PREVIEW_AND_CURSOR )
{ {
for( int i=0; i<NUM_PREVIEW_PARTS; i++ ) for( int i=0; i<NUM_PREVIEW_PARTS; i++ )
{
fSecs = max( fSecs, OFF_COMMAND( m_sprPreview[i][c][0] ) ); fSecs = max( fSecs, OFF_COMMAND( m_sprPreview[i][c][0] ) );
fSecs = max( fSecs, COMMAND( m_sprPreview[i][c][0], SelectedByEitherPlayer? "OffFocused":"OffUnfocused" ) );
}
} }
else else
{ {
for( int i=0; i<NUM_PREVIEW_PARTS; i++ ) for( int i=0; i<NUM_PREVIEW_PARTS; i++ )
for( int p=0; p<NUM_PLAYERS; p++ ) for( int p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsPlayerEnabled(p) ) if( GAMESTATE->IsPlayerEnabled(p) )
{
fSecs = max( fSecs, OFF_COMMAND( m_sprPreview[i][c][p] ) ); fSecs = max( fSecs, OFF_COMMAND( m_sprPreview[i][c][p] ) );
fSecs = max( fSecs, COMMAND( m_sprPreview[i][c][0], SelectedByEitherPlayer? "OffFocused":"OffUnfocused" ) );
}
} }
} }