From 684953032500c2e801d1b6c0dede9c4d1527ef3b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 27 Sep 2003 08:00:10 +0000 Subject: [PATCH] Default ctor for OptionRow. Remove redundant m_sName (it's in Actor, too). --- stepmania/src/ScreenOptions.cpp | 4 +--- stepmania/src/ScreenOptions.h | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index e658729d39..70dd7e2d39 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -40,12 +40,10 @@ const float ITEM_X[NUM_PLAYERS] = { 260, 420 }; #define COLOR_NOT_SELECTED THEME->GetMetricC("ScreenOptions","ColorNotSelected") #define NUM_SHOWN_ITEMS THEME->GetMetricI("ScreenOptions","NumShownItems") -ScreenOptions::ScreenOptions( CString sClassName ) : Screen("ScreenOptions") +ScreenOptions::ScreenOptions( CString sClassName ) : Screen(sClassName) { LOG->Trace( "ScreenOptions::ScreenOptions()" ); - m_sName = sClassName; - m_SoundChangeCol.Load( THEME->GetPathToS("ScreenOptions change") ); m_SoundNextRow.Load( THEME->GetPathToS("ScreenOptions next") ); m_SoundPrevRow.Load( THEME->GetPathToS("ScreenOptions prev") ); diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 67f1b83238..c1a9817362 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -30,6 +30,8 @@ struct OptionRow bool bOneChoiceForAllPlayers; vector choices; + OptionRow(): name(""), bOneChoiceForAllPlayers(false) { } + OptionRow( const char *n, int b, const char *c0=NULL, const char *c1=NULL, const char *c2=NULL, const char *c3=NULL, const char *c4=NULL, const char *c5=NULL, const char *c6=NULL, const char *c7=NULL, const char *c8=NULL, const char *c9=NULL, const char *c10=NULL, const char *c11=NULL, const char *c12=NULL, const char *c13=NULL, const char *c14=NULL, const char *c15=NULL, const char *c16=NULL, const char *c17=NULL, const char *c18=NULL, const char *c19=NULL ) { name = n; @@ -96,7 +98,6 @@ protected: int m_iSelectedOption[NUM_PLAYERS][MAX_OPTION_LINES]; private: - CString m_sName; InputMode m_InputMode; bool m_bLoadExplanations;