From b18edf25073b2158bdd5aba95b04bb391dd7ca99 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 28 Feb 2003 08:19:10 +0000 Subject: [PATCH] clean this up don't compare booleans to "true" or "false"; it's redundant (this is still a hack, but I don't feel like puzzling out the right way to do this) --- stepmania/src/Player.cpp | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 403f91688e..ac5c1f1b48 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -164,27 +164,20 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi // If solo-single is enabled.. - if( PREFSMAN->m_bSoloSingle == true && GAMESTATE->GetCurrentStyleDef()->m_NotesType == STYLE_DANCE_SINGLE && GAMESTATE->GetNumSidesJoined() == 1 ) + if( PREFSMAN->m_bSoloSingle && + GAMESTATE->GetCurrentStyleDef()->m_NotesType == STYLE_DANCE_SINGLE && + GAMESTATE->GetNumSidesJoined() == 1 && + GAMESTATE->IsPlayerEnabled(0) ) { - int iJoinedSide; - for( unsigned u=0;uIsPlayerEnabled(u) == true ) - iJoinedSide = u; - - - - if( iJoinedSide == 0 ) - { - m_GhostArrowRow.SetX( 165 ); - m_GrayArrowRow.SetX( 165 ); - m_NoteField.SetX( 165 ); - m_Combo.SetX( 165 ); - for( c=0; cm_iColsPerPlayer; c++ ) - { - m_HoldJudgment[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset + m_GhostArrowRow.GetX()); - } - m_Judgment.SetX( 165 ); - } + m_GhostArrowRow.SetX( 165 ); + m_GrayArrowRow.SetX( 165 ); + m_NoteField.SetX( 165 ); + m_Combo.SetX( 165 ); + + for( c=0; cm_iColsPerPlayer; c++ ) + m_HoldJudgment[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset + m_GhostArrowRow.GetX()); + + m_Judgment.SetX( 165 ); }