fix wrong ROW_STEP options show on SSOM if switch to a course mode then back to a song mode

2004-02-06 04:01:08 +00:00
parent 4654e5049a
commit fc0192917b
2 changed files with 38 additions and 6 deletions
@@ -107,7 +107,7 @@ void ScreenOptionsMaster::SetStep( OptionRowData &row, OptionRowHandler &hand )
 		row.choices.push_back( "" );
 		hand.ListEntries.push_back( ModeChoice() );
 	}
-	else if( GAMESTATE->m_pCurCourse )   // playing a course
+	else if( GAMESTATE->IsCourseMode() )   // playing a course
 	{
 		row.bOneChoiceForAllPlayers = PREFSMAN->m_bLockCourseDifficulties;

@@ -127,7 +127,7 @@ void ScreenOptionsMaster::SetStep( OptionRowData &row, OptionRowHandler &hand )
 			}
 		}
 	}
-	else if( GAMESTATE->m_pCurSong )	// playing a song
+	else // !GAMESTATE->IsCourseMode(), playing a song
 	{
 		vector<Steps*> vSteps;
 		GAMESTATE->m_pCurSong->GetSteps( vSteps, GAMESTATE->GetCurrentStyleDef()->m_StepsType );
@@ -148,10 +148,6 @@ void ScreenOptionsMaster::SetStep( OptionRowData &row, OptionRowHandler &hand )
 			hand.ListEntries.push_back( mc );
 		}
 	}
-	else
-	{
-		row.choices.push_back( ENTRY_NAME("N/A") );
-	}
 }