From a9db266eb203aa49c555a74acef62c495e9a7612 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 24 May 2004 08:16:17 +0000 Subject: [PATCH] "for( p=0; p "FOREACH_PlayerNumber( p )" --- stepmania/src/Background.cpp | 8 +- stepmania/src/CombinedLifeMeterTug.cpp | 5 +- stepmania/src/DancingCharacters.cpp | 38 +++---- stepmania/src/GameState.cpp | 10 +- stepmania/src/MusicWheelItem.cpp | 3 +- stepmania/src/ScreenEvaluation.cpp | 10 +- stepmania/src/ScreenEz2SelectPlayer.cpp | 5 +- stepmania/src/ScreenNameEntry.cpp | 6 +- stepmania/src/ScreenSelectCharacter.cpp | 6 +- stepmania/src/ScreenSelectDifficulty.cpp | 76 ++++++------- stepmania/src/ScreenSelectDifficultyEX.cpp | 17 ++- stepmania/src/ScreenSelectMaster.cpp | 118 +++++++++------------ stepmania/src/ScreenSelectMusic.cpp | 6 +- stepmania/src/ScreenStage.cpp | 3 +- 14 files changed, 130 insertions(+), 181 deletions(-) diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index b4636686d1..a916520b98 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -50,22 +50,20 @@ Background::Background() BLINK_DANGER_ALL.Refresh(); DANGER_ALL_IS_OPAQUE.Refresh(); - int p; - m_iCurBGChangeIndex = -1; m_pCurrentBGA = NULL; m_pFadingBGA = NULL; m_fSecsLeftInFade = 0; m_DangerAll.LoadFromAniDir( THEME->GetPathToB("ScreenGameplay danger all") ); - for( p=0; pGetPathToB(ssprintf("ScreenGameplay danger p%d",p+1)) ); - for( p=0; pGetPathToB(ssprintf("ScreenGameplay dead p%d",p+1)) ); bool bOneOrMoreChars = false; bool bShowingBeginnerHelper = false; - for( p=0; pIsHumanPlayer(p) ) continue; diff --git a/stepmania/src/CombinedLifeMeterTug.cpp b/stepmania/src/CombinedLifeMeterTug.cpp index a432fb48f7..5b7e643a77 100644 --- a/stepmania/src/CombinedLifeMeterTug.cpp +++ b/stepmania/src/CombinedLifeMeterTug.cpp @@ -25,8 +25,7 @@ CombinedLifeMeterTug::CombinedLifeMeterTug() { METER_WIDTH.Refresh(); - int p; - for( p=0; pGetPathToG(ssprintf("CombinedLifeMeterTug stream p%d",p+1)); CString sTipPath = THEME->GetPathToG(ssprintf("CombinedLifeMeterTug tip p%d",p+1)); @@ -42,7 +41,7 @@ CombinedLifeMeterTug::CombinedLifeMeterTug() this->AddChild( &m_sprFrame ); - for( p=0; pm_pCurCharacters[p]; ASSERT( pCharacter ); diff --git a/stepmania/src/DancingCharacters.cpp b/stepmania/src/DancingCharacters.cpp index f4390e1375..873e4886a8 100644 --- a/stepmania/src/DancingCharacters.cpp +++ b/stepmania/src/DancingCharacters.cpp @@ -337,37 +337,33 @@ void DancingCharacters::DrawPrimitives() m_LookAt, RageVector3(0,1,0) ); - int p; - for( p=0; pIsPlayerEnabled(p) ) - { - bool bFailed = g_CurStageStats.bFailed[p]; - bool bDanger = m_bDrawDangerLight; + bool bFailed = g_CurStageStats.bFailed[p]; + bool bDanger = m_bDrawDangerLight; - DISPLAY->SetLighting( true ); - RageColor ambient = bFailed ? RageColor(0.2f,0.1f,0.1f,1) : (bDanger ? RageColor(0.4f,0.1f,0.1f,1) : RageColor(0.4f,0.4f,0.4f,1)); - RageColor diffuse = bFailed ? RageColor(0.4f,0.1f,0.1f,1) : (bDanger ? RageColor(0.8f,0.1f,0.1f,1) : RageColor(0.8f,0.8f,0.8f,1)); - RageColor specular = RageColor(0.8f,0.8f,0.8f,1); + DISPLAY->SetLighting( true ); + RageColor ambient = bFailed ? RageColor(0.2f,0.1f,0.1f,1) : (bDanger ? RageColor(0.4f,0.1f,0.1f,1) : RageColor(0.4f,0.4f,0.4f,1)); + RageColor diffuse = bFailed ? RageColor(0.4f,0.1f,0.1f,1) : (bDanger ? RageColor(0.8f,0.1f,0.1f,1) : RageColor(0.8f,0.8f,0.8f,1)); + RageColor specular = RageColor(0.8f,0.8f,0.8f,1); - DISPLAY->SetLightDirectional( - 0, - ambient, - diffuse, - specular, - RageVector3(+1, 0, +1) ); + DISPLAY->SetLightDirectional( + 0, + ambient, + diffuse, + specular, + RageVector3(+1, 0, +1) ); - m_Character[p].Draw(); + m_Character[p].Draw(); - DISPLAY->SetLightOff( 0 ); - DISPLAY->SetLighting( false ); - } + DISPLAY->SetLightOff( 0 ); + DISPLAY->SetLighting( false ); } DISPLAY->CameraPopMatrix(); // now draw any potential 2D stuff - for( p=0; pIsPlayerEnabled(p) ) continue; @@ -1148,7 +1146,7 @@ void ScreenEvaluation::TweenOffScreen() // grade area if( SHOW_GRADE_AREA ) { - for( p=0; pIsPlayerEnabled(p) ) continue; @@ -1160,7 +1158,7 @@ void ScreenEvaluation::TweenOffScreen() if( SHOW_GRAPH_AREA ) { - for( p=0; pIsPlayerEnabled(p) ) continue; // skip @@ -1172,7 +1170,7 @@ void ScreenEvaluation::TweenOffScreen() if( SHOW_COMBO_AREA ) { - for( p=0; pIsPlayerEnabled(p) ) continue; // skip diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 2d7b44b227..58be0f425b 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -50,8 +50,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer( CString sName ) : ScreenWithMenuEl { // Unjoin the players, then let them join back in on this screen // GAMESTATE->m_bPlayersCanJoin = true; - int p; - for( p=0; pm_bSideIsJoined[p] = false; LOG->Trace( "ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()" ); @@ -59,7 +58,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer( CString sName ) : ScreenWithMenuEl m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenEz2SelectPlayer background") ); this->AddChild( &m_Background ); // animated background =) - for( p=0; pGetPathToG("ScreenEz2SelectPlayer join frame 1x2") ); m_sprJoinFrame[p].StopAnimating(); diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index afbba10051..68bbc2fe8e 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -134,12 +134,10 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) GAMESTATE->m_SongOptions = SongOptions(); } - int p; - vector aFeats[NUM_PLAYERS]; // Find out if players deserve to enter their name - for( p=0; pGetRankingFeats( (PlayerNumber)p, aFeats[p] ); m_bStillEnteringName[p] = aFeats[p].size()>0; @@ -169,7 +167,7 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenNameEntry background") ); this->AddChild( &m_Background ); - for( p=0; pGetProfile((PlayerNumber)p); diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index eecb6f55df..317129c00d 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -91,7 +91,7 @@ ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithM int p; - for( p=0; pIsHumanPlayer(p) ) @@ -99,7 +99,7 @@ ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithM } - for( p=0; pIsPlayerEnabled(p) ) continue; @@ -155,7 +155,7 @@ ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithM SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectCharacter music") ); - for( p=0; pIsHumanPlayer(p) ) { diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index 889c4cfe1a..e9ad18f674 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -39,8 +39,8 @@ ScreenSelectDifficulty::ScreenSelectDifficulty( CString sClassName ) : ScreenSelect( sClassName ) { m_CurrentPage = PAGE_1; - int p; - for( p=0; pIsHumanPlayer(p) ) + //FOREACH_HumanPlayer( p ) // { - // MenuRight( (PlayerNumber)p ); - // MenuLeft( (PlayerNumber)p ); + // MenuRight( p ); + // MenuLeft( p ); // } } @@ -281,11 +280,9 @@ void ScreenSelectDifficulty::MenuRight( PlayerNumber pn ) void ScreenSelectDifficulty::ChangePage( Page newPage ) { - int p; - // If anyone has already chosen, don't allow changing of pages - for( p=0; pIsHumanPlayer(p) && m_bChosen[p] ) + FOREACH_HumanPlayer( p ) + if( m_bChosen[p] ) return; bool bPageIncreasing = newPage > m_CurrentPage; @@ -321,8 +318,8 @@ void ScreenSelectDifficulty::ChangePage( Page newPage ) } // change both players - for( p=0; pIsHumanPlayer(p) ) - continue; // skip - if( p!=pn && m_CurrentPage==PAGE_1 ) continue; // skip if( m_iChoiceOnPage[p] == iNewChoice ) @@ -348,8 +342,8 @@ bool ScreenSelectDifficulty::ChangeWithinPage( PlayerNumber pn, int iNewChoice, bAnyChanged = true; m_iChoiceOnPage[p] = iNewChoice; - float fCursorX = GetCursorX( (PlayerNumber)p ); - float fCursorY = GetCursorY( (PlayerNumber)p ); + float fCursorX = GetCursorX( p ); + float fCursorY = GetCursorY( p ); m_sprCursor[p].StopTweening(); m_sprCursor[p].BeginTweening( 0.2f, bChangingPages ? TWEEN_LINEAR : TWEEN_DECELERATE ); @@ -386,28 +380,26 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) SCREENMAN->PlayStartSound(); } - int p; - // courses should be selected for both players at all times if( BothPlayersModeChoice(mc) ) { - for( p=0; pIsHumanPlayer((PlayerNumber)p) || p == pn ) + if( m_bChosen[p] || p == pn ) continue; // move all cursors to the oni/nonstop selection so it graphically looks as if all players selected the same option. - ChangeWithinPage( (PlayerNumber)p, m_iChoiceOnPage[pn], false ); + ChangeWithinPage( p, m_iChoiceOnPage[pn], false ); bPlaySelect = false; - MenuStart( (PlayerNumber)p ); // agree everyone + MenuStart( p ); // agree everyone bPlaySelect = true; } } else // someone must have chosen arcade style play so oni/nonstop/endless must be disabled { - for( p=0; pIsHumanPlayer((PlayerNumber)p) || p == pn ) + if( m_bChosen[p] || p == pn ) continue; if( !BothPlayersModeChoice(m_ModeChoices[m_CurrentPage][m_iChoiceOnPage[p]]) ) @@ -437,16 +429,16 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) ASSERT( iSwitchToIndex != -1 ); // move the cursor - ChangeWithinPage( (PlayerNumber) p, iSwitchToIndex, false ); + ChangeWithinPage( p, iSwitchToIndex, false ); } /* If the other player is active and hasn't yet chosen, gray out unselectable options. * Otherwise, don't do this, so we don't gray out stuff when nothing else can be selected * anyway. */ bool bAnyPlayersLeft = false; - for( p=0; pIsHumanPlayer((PlayerNumber)p) || m_bChosen[p] || p == pn ) + if( m_bChosen[p] || p == pn ) continue; bAnyPlayersLeft = true; } @@ -470,13 +462,13 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) if( m_CurrentPage == PAGE_2 ) { // choose this for all the other players too - for( p=0; pIsHumanPlayer((PlayerNumber)p) && m_bChosen[p] == false ) + if( m_bChosen[p] == false ) return; } this->PostScreenMessage( SM_BeginFadingOut, SLEEP_AFTER_CHOICE_SECONDS ); // tell our owner it's time to move on @@ -499,8 +491,6 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn ) void ScreenSelectDifficulty::TweenOnScreen() { - unsigned p; - for( int page=0; pageIsHumanPlayer((PlayerNumber)p) ) - continue; - - float fCursorX = GetCursorX( (PlayerNumber)p ); - float fCursorY = GetCursorY( (PlayerNumber)p ); + float fCursorX = GetCursorX( p ); + float fCursorY = GetCursorY( p ); m_sprCursor[p].SetXY( fCursorX, fCursorY ); ON_COMMAND( m_sprCursor[p] ); @@ -536,11 +523,8 @@ void ScreenSelectDifficulty::TweenOffScreen() OFF_COMMAND( m_sprExplanation[page] ); OFF_COMMAND( m_sprMore[page] ); - FOREACH_PlayerNumber( p ) + FOREACH_HumanPlayer( p ) { - if( !GAMESTATE->IsHumanPlayer(p) ) - continue; - OFF_COMMAND( m_sprCursor[p] ); OFF_COMMAND( m_sprOK[p] ); OFF_COMMAND( m_sprShadow[p] ); diff --git a/stepmania/src/ScreenSelectDifficultyEX.cpp b/stepmania/src/ScreenSelectDifficultyEX.cpp index 85e70e4a3e..cc4c5a7e21 100644 --- a/stepmania/src/ScreenSelectDifficultyEX.cpp +++ b/stepmania/src/ScreenSelectDifficultyEX.cpp @@ -56,8 +56,8 @@ ScreenSelectDifficultyEX::ScreenSelectDifficultyEX( CString sClassName ) : ScreenSelect( sClassName ) { m_CurrentPage = PAGE_1; - int p; - for( p=0; pIsPlayerEnabled(p) ) // Only show their cursor, if they're enabled { @@ -374,8 +374,7 @@ void ScreenSelectDifficultyEX::MenuStart( PlayerNumber pn ) const ModeChoice& mc = m_ModeChoices[m_iChoice[pn]]; bool AnotherPlayerSelected = false; - int p; - for( p=0; pIsPlayerEnabled((PlayerNumber)p) && m_bChosen[p] == false ) { @@ -428,9 +427,7 @@ void ScreenSelectDifficultyEX::MenuStart( PlayerNumber pn ) void ScreenSelectDifficultyEX::TweenOnScreen() { - unsigned p; - - for( p=0; pIsPlayerEnabled((PlayerNumber)p) ) { continue; } diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index b702f21d0c..bc04be7775 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -50,9 +50,7 @@ const ScreenMessage SM_PlayPostSwitchPage = (ScreenMessage)(SM_User+1); ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName ) { - int p, i; - - for( p=0; pIsPlayerEnabled(p) ) - continue; // skip CString sFName = ssprintf("%s Cursor Part%d P%d", m_sName.c_str(),i+1,p+1); m_sprCursor[i][p].SetName( ssprintf("CursorPart%dP%d",i+1,p+1) ); m_sprCursor[i][p].Load( THEME->GetPathToG(sFName) ); @@ -112,11 +108,8 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl } else { - for( p=0; pIsPlayerEnabled(p) ) - continue; // skip - m_Scroller[p].Load( SCROLLER_SECONDS_PER_ITEM, 7, @@ -145,7 +138,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl const ModeChoice& mc = m_aModeChoices[c]; // init icon - for( i=0; iGetPathToG(sFName) ); @@ -166,10 +159,8 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl } else { - for( p=0; pIsPlayerEnabled(p) ) - continue; // skip for( i=0; iIsPlayerEnabled(p) ) - { - m_sprCursor[i][p].SetXY( GetCursorX((PlayerNumber)p,i), GetCursorY((PlayerNumber)p,i) ); - COMMAND( m_sprCursor[i][p], "PostSwitchPage" ); - } + FOREACH_HumanPlayer( p ) + { + m_sprCursor[i][p].SetXY( GetCursorX((PlayerNumber)p,i), GetCursorY((PlayerNumber)p,i) ); + COMMAND( m_sprCursor[i][p], "PostSwitchPage" ); + } } if( SHARED_PREVIEW_AND_CURSOR ) @@ -306,9 +296,8 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM ) else { for( int i=0; iIsPlayerEnabled(p) ) - COMMAND( m_sprPreview[i][m_iChoice[p]][p], "PostSwitchPage" ); + FOREACH_HumanPlayer( p ) + COMMAND( m_sprPreview[i][m_iChoice[p]][p], "PostSwitchPage" ); } m_fLockInputSecs = POST_SWITCH_PAGE_SECONDS; @@ -406,8 +395,7 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice ) Page newPage = GetPage(iNewChoice); // If anyone has already chosen, don't allow changing of pages - int p; - for( p=0; pIsHumanPlayer(p) && m_bChosen[p] ) return false; @@ -432,15 +420,18 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice ) if( SHARED_PREVIEW_AND_CURSOR ) { + int iChoice = m_iChoice[GAMESTATE->m_MasterPlayerNumber]; for( int i=0; iIsPlayerEnabled(p) ) - COMMAND( m_sprPreview[i][m_iChoice[p]][p], "PreSwitchPage" ); + FOREACH_HumanPlayer( p ) + { + int iChoice = m_iChoice[p]; + COMMAND( m_sprPreview[i][iChoice][p], "PreSwitchPage" ); + } } for( int page=0; pageIsPlayerEnabled(p) ) - for( int i=0; iFinishTweening(); - SET_XY_AND_ON_COMMAND( m_sprPreview[i][c][p] ); - } + FOREACH_HumanPlayer( p ) + for( int i=0; iFinishTweening(); + SET_XY_AND_ON_COMMAND( m_sprPreview[i][c][p] ); + } } } @@ -687,12 +677,11 @@ void ScreenSelectMaster::TweenOnScreen() else { for( int i=0; iIsPlayerEnabled(p) ) - { - m_sprCursor[i][p].SetXY( GetCursorX((PlayerNumber)p,i), GetCursorY((PlayerNumber)p,i) ); - ON_COMMAND( m_sprCursor[i][p] ); - } + FOREACH_HumanPlayer( p ) + { + m_sprCursor[i][p].SetXY( GetCursorX((PlayerNumber)p,i), GetCursorY((PlayerNumber)p,i) ); + ON_COMMAND( m_sprCursor[i][p] ); + } } if( SHOW_SCROLLER ) @@ -705,14 +694,13 @@ void ScreenSelectMaster::TweenOnScreen() COMMAND( *m_sprScroll[c][0], int(c) == m_iChoice[0]? "GainFocus":"LoseFocus" ); } else - FOREACH_PlayerNumber( p ) - if( GAMESTATE->IsPlayerEnabled(p) ) - { - m_Scroller[p].SetCurrentAndDestinationItem( m_iChoice[p] ); - SET_XY_AND_ON_COMMAND( m_Scroller[p] ); - for( unsigned c=0; cIsPlayerEnabled(p) ) - OFF_COMMAND( m_sprCursor[i][p] ); + FOREACH_HumanPlayer( p ) + OFF_COMMAND( m_sprCursor[i][p] ); } for( unsigned c=0; cIsPlayerEnabled(p) && m_iChoice[p] == (int)c ) + FOREACH_HumanPlayer( p ) + if( m_iChoice[p] == (int)c ) SelectedByEitherPlayer = true; for( int i=0; iIsPlayerEnabled(p) ) - { - OFF_COMMAND( m_sprPreview[i][c][p] ); - COMMAND( m_sprPreview[i][c][0], SelectedByEitherPlayer? "OffFocused":"OffUnfocused" ); - } + FOREACH_HumanPlayer( p ) + { + OFF_COMMAND( m_sprPreview[i][c][p] ); + COMMAND( m_sprPreview[i][c][0], SelectedByEitherPlayer? "OffFocused":"OffUnfocused" ); + } } } diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 2b90075bce..4c8911bebd 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -101,10 +101,8 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme m_MusicWheel.Load(); - int p; - // pop'n music has this under the songwheel... - for( p=0; pm_pCurCharacters[p]; m_sprCharacterIcon[p].SetName( ssprintf("CharacterIconP%d",p+1) ); @@ -239,7 +237,7 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme this->AddChild( &m_DifficultyList ); } - for( p=0; pIsHumanPlayer(p) ) continue; // skip diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index dcea4914bb..775d95e05a 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -126,8 +126,7 @@ void ScreenStage::HandleScreenMessage( const ScreenMessage SM ) case SM_BeginFadingOut: m_Out.StartTransitioning(); - int p; - for( p=0; p