fix "only difficulties from last song show when move to Random/Roulette"

stepmania/src/DifficultyList.cpp

@@ -87,29 +87,33 @@ void DifficultyList::Load()
 	PositionItems();
 }
 
-void DifficultyList::GetCurrentRows( int iCurrentRow[NUM_PLAYERS] ) const
+int DifficultyList::GetCurrentRowIndex( PlayerNumber pn ) const
 {
-	for( int pn = 0;pn < NUM_PLAYERS; ++pn )
+	for( unsigned i=0; i<m_Rows.size(); i++ )
 	{
-		if( !GAMESTATE->IsHumanPlayer(pn) )
+		const Row &row = m_Rows[i];
-			continue;
 
-		for( iCurrentRow[pn] = 0; iCurrentRow[pn] < (int) m_Rows.size(); ++iCurrentRow[pn] )
+		if( GAMESTATE->m_pCurNotes[pn] == NULL )
 		{
-			if( GAMESTATE->m_pCurNotes[pn] == m_Rows[iCurrentRow[pn]]->m_Steps )
+			if( row.m_dc == GAMESTATE->m_PreferredDifficulty[pn] )
-				break;
+				return i;
-			if( GAMESTATE->m_pCurNotes[pn] == NULL && 
+		}
-				m_Rows[iCurrentRow[pn]]->m_Steps->GetDifficulty() == GAMESTATE->m_PreferredDifficulty[pn] )
+		else
-				break;
+		{
+			if( GAMESTATE->m_pCurNotes[pn] == row.m_Steps )
+				return i;
 		}
 	}
+	
+	return 0;
 }
 
 /* Update m_fY and m_bHidden[]. */
 void DifficultyList::UpdatePositions()
 {
 	int iCurrentRow[NUM_PLAYERS];
-	GetCurrentRows( iCurrentRow );
+	FOREACH_HumanPlayer( p )
+		iCurrentRow[p] = GetCurrentRowIndex( p );
 
 	const int total = NUM_SHOWN_ITEMS;
 	const int halfsize = total / 2;
@@ -120,7 +124,7 @@ void DifficultyList::UpdatePositions()
 	int P1Choice = GAMESTATE->IsHumanPlayer(PLAYER_1)? iCurrentRow[PLAYER_1]: iCurrentRow[PLAYER_2];
 	int P2Choice = GAMESTATE->IsHumanPlayer(PLAYER_2)? iCurrentRow[PLAYER_2]: iCurrentRow[PLAYER_1];
 
-	vector<Row*> Rows( m_Rows );
+	vector<Row> &Rows = m_Rows;
 
 	const bool BothPlayersActivated = GAMESTATE->IsHumanPlayer(PLAYER_1) && GAMESTATE->IsHumanPlayer(PLAYER_2);
 	if( !BothPlayersActivated )
@@ -185,7 +189,7 @@ void DifficultyList::UpdatePositions()
 		else
 			ItemPosition = (float) total - 0.5f;
 			
-		Row &row = *Rows[i];
+		Row &row = Rows[i];
 
 		float fY = ITEMS_SPACING_Y*ItemPosition;
 		row.m_fY = fY;
@@ -209,7 +213,7 @@ void DifficultyList::PositionItems()
 	int m;
 	for( m = 0; m < (int)m_Rows.size(); ++m )
 	{
-		Row &row = *m_Rows[m];
+		Row &row = m_Rows[m];
 		bool bHidden = row.m_bHidden;
 		if( !m_bShown )
 			bHidden = true;
@@ -233,7 +237,7 @@ void DifficultyList::PositionItems()
 	{
 		bool bHidden = true;
 		if( m_bShown && m < (int)m_Rows.size() )
-			bHidden = m_Rows[m]->m_bHidden;
+			bHidden = m_Rows[m].m_bHidden;
 
 		const CString cmd = ssprintf( "diffusealpha,%f", bHidden? 0.0f:1.0f );
 		m_Lines[m].m_Description.Command( cmd );
@@ -241,25 +245,20 @@ void DifficultyList::PositionItems()
 		m_Lines[m].m_Number.Command( cmd );
 	}
 
-	int iCurrentRow[NUM_PLAYERS];
-	GetCurrentRows( iCurrentRow );
 
 	FOREACH_HumanPlayer( pn )
 	{
+		int iCurrentRow = GetCurrentRowIndex( pn );
+
 		float fY = 0;
-		if( iCurrentRow[pn] < (int) m_Rows.size() )
+		if( iCurrentRow < (int) m_Rows.size() )
-			fY = m_Rows[iCurrentRow[pn]]->m_fY;
+			fY = m_Rows[iCurrentRow].m_fY;
 
 		COMMAND( m_CursorFrames[pn], "Change" );
 		m_CursorFrames[pn].SetY( fY );
 	}
 }
 
-DifficultyList::Row::Row()
-{
-	m_Steps = NULL;
-}
-
 void DifficultyList::SetFromGameState()
 {
 	Song *song = GAMESTATE->m_pCurSong;
@@ -278,6 +277,8 @@ void DifficultyList::SetFromGameState()
 			m_Lines[m].m_Description.SetText( "" );
 		}
 
+		m_Rows.clear();
+
 		if( song == NULL )
 		{
 			// FIXME: This clamps to between the min and the max difficulty, but
@@ -291,6 +292,12 @@ void DifficultyList::SetFromGameState()
 				if( d == DIFFICULTY_INVALID )
 					continue;
 
+				m_Rows.resize( m_Rows.size()+1 );
+
+				Row &row = m_Rows.back();
+
+				row.m_dc = d;
+
 				m_Lines[i].m_Meter.SetMeter( 3*(d), d );
 				m_Lines[i].m_Number.SetText( "?" );
 				m_Lines[i].m_Description.SetText( DifficultyToThemedString(d) );
@@ -304,34 +311,29 @@ void DifficultyList::SetFromGameState()
 			/* Should match the sort in ScreenSelectMusic::AfterMusicChange. */
 			StepsUtil::SortNotesArrayByDifficulty( CurSteps );
 
-			unsigned i;
+			m_Rows.resize( CurSteps.size() );
-			for( i = 0; i < m_Rows.size(); ++i )
+			for( unsigned i = 0; i < CurSteps.size(); ++i )
-				delete m_Rows[i];
-			m_Rows.clear();
-
-			for( i = 0; i < CurSteps.size(); ++i )
 			{
-				m_Rows.push_back( new Row() );
+				Row &row = m_Rows[i];
-				Row &row = *m_Rows[i];
 
 				row.m_Steps = CurSteps[i];
 
-				m_Lines[i].m_Meter.SetFromNotes( m_Rows[i]->m_Steps );
+				m_Lines[i].m_Meter.SetFromNotes( m_Rows[i].m_Steps );
 
-				Difficulty dc = row.m_Steps->GetDifficulty();
+				row.m_dc = row.m_Steps->GetDifficulty();
 				
 				CString s;
 				if( row.m_Steps->GetDifficulty() == DIFFICULTY_EDIT )
 					s = row.m_Steps->GetDescription();
 				else
-					s = DifficultyToThemedString(dc);
+					s = DifficultyToThemedString(row.m_dc);
 				m_Lines[i].m_Description.SetMaxWidth( DESCRIPTION_MAX_WIDTH );
 				m_Lines[i].m_Description.SetText( s );
 				/* Don't mess with alpha; it might be fading on. */
-				m_Lines[i].m_Description.SetDiffuseColor( SONGMAN->GetDifficultyColor(dc) );
+				m_Lines[i].m_Description.SetDiffuseColor( SONGMAN->GetDifficultyColor(row.m_dc) );
 				
 				m_Lines[i].m_Number.SetZoomX(1);
-				m_Lines[i].m_Number.SetDiffuseColor( SONGMAN->GetDifficultyColor(dc) );
+				m_Lines[i].m_Number.SetDiffuseColor( SONGMAN->GetDifficultyColor(row.m_dc) );
 				m_Lines[i].m_Number.SetText( ssprintf("%d",row.m_Steps->GetMeter()) );
 			}
 		}

stepmania/src/DifficultyList.h

@@ -26,7 +26,7 @@ public:
 private:
 	void UpdatePositions();
 	void PositionItems();
-	void GetCurrentRows( int iCurrentRow[NUM_PLAYERS] ) const;
+	int GetCurrentRowIndex( PlayerNumber pn ) const;
 	void HideRows();
 
 	AutoActor		m_Cursors[NUM_PLAYERS];
@@ -45,14 +45,21 @@ private:
 
 	struct Row
 	{
-		Row();
+		Row()
+		{
+			m_Steps = NULL;
+			m_dc = DIFFICULTY_INVALID;
+			m_fY = 0;
+			m_bHidden = false;
+		}
 		
 		Steps *m_Steps;
+		Difficulty m_dc;
 		float m_fY;
 		bool m_bHidden; // currently off screen
 	};
 	
-	vector<Row*>		m_Rows;
+	vector<Row>		m_Rows;
 };
 
 #endif