diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index fda703e53d..054ef224f2 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -74,7 +74,6 @@ ScreenOptions::ScreenOptions( CString sClassName, bool bEnableTimer ) : Screen(" m_framePage.SetX( SCREEN_LEFT-SCREEN_WIDTH ); m_framePage.BeginTweening( 0.3f, Actor::TWEEN_DECELERATE ); m_framePage.SetX( 0 ); - memset(&m_OptionDim, 0, sizeof(m_OptionDim)); memset(&m_bRowIsLong, 0, sizeof(m_bRowIsLong)); } @@ -254,27 +253,6 @@ void ScreenOptions::InitOptionsText() option.SetXY( CENTER_X, fY ); } -void ScreenOptions::DimOption(int line, int option, bool dim) -{ - if(m_OptionDim[line][option] == dim) - return; - - m_OptionDim[line][option] = dim; - m_textItems[line][option].StopTweening(); - m_textItems[line][option].BeginTweening(.250); - if(m_OptionDim[line][option]) - m_textItems[line][option].SetDiffuse( RageColor(.5,.5,.5,1) ); - else - m_textItems[line][option].SetDiffuse( RageColor(1,1,1,1) ); -} - -bool ScreenOptions::RowCompletelyDimmed(int line) const -{ - for(unsigned i = 0; i < m_OptionRow[line].choices.size(); ++i) - if(!m_OptionDim[line][i]) return false; - return true; -} - void ScreenOptions::PositionUnderlines() { // Set the position of the underscores showing the current choice for each option line. diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index d6907f98d8..80a8dd4d92 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -99,21 +99,16 @@ protected: Sprite m_sprBullets[MAX_OPTION_LINES]; BitmapText m_textTitles[MAX_OPTION_LINES]; BitmapText m_textItems[MAX_OPTION_LINES][MAX_OPTIONS_PER_LINE]; // this array has to be big enough to hold all of the options - bool m_OptionDim[MAX_OPTION_LINES][MAX_OPTIONS_PER_LINE]; - void DimOption(int line, int option, bool dim); - bool RowCompletelyDimmed(int line) const; bool m_bRowIsLong[MAX_OPTION_LINES]; // goes off edge of screen int m_iSelectedOption[NUM_PLAYERS][MAX_OPTION_LINES]; int m_iCurrentRow[NUM_PLAYERS]; -// Quad m_OptionUnderline[NUM_PLAYERS][MAX_OPTION_LINES]; -// Quad m_SelectionHighlight[NUM_PLAYERS]; - OptionsCursor m_Underline[NUM_PLAYERS][MAX_OPTION_LINES]; OptionIcon m_OptionIcons[NUM_PLAYERS][MAX_OPTION_LINES]; OptionsCursor m_Highlight[NUM_PLAYERS]; +private: BitmapText m_textExplanation; RageSound m_SoundChangeCol;