actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Default ctor for OptionRow.

Browse Source 
Remove redundant m_sName (it's in Actor, too).
This commit is contained in:
Glenn Maynard
2003-09-27 08:00:10 +00:00
parent 40d5240536
commit 6849530325
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+1 -3
View File
@@ -40,12 +40,10 @@ const float ITEM_X[NUM_PLAYERS] = { 260, 420 };
#define COLOR_NOT_SELECTED THEME->GetMetricC("ScreenOptions","ColorNotSelected") #define COLOR_NOT_SELECTED THEME->GetMetricC("ScreenOptions","ColorNotSelected")
#define NUM_SHOWN_ITEMS THEME->GetMetricI("ScreenOptions","NumShownItems") #define NUM_SHOWN_ITEMS THEME->GetMetricI("ScreenOptions","NumShownItems")
ScreenOptions::ScreenOptions( CString sClassName ) : Screen("ScreenOptions") ScreenOptions::ScreenOptions( CString sClassName ) : Screen(sClassName)
{ {
LOG->Trace( "ScreenOptions::ScreenOptions()" ); LOG->Trace( "ScreenOptions::ScreenOptions()" );
m_sName = sClassName;
m_SoundChangeCol.Load( THEME->GetPathToS("ScreenOptions change") ); m_SoundChangeCol.Load( THEME->GetPathToS("ScreenOptions change") );
m_SoundNextRow.Load( THEME->GetPathToS("ScreenOptions next") ); m_SoundNextRow.Load( THEME->GetPathToS("ScreenOptions next") );
m_SoundPrevRow.Load( THEME->GetPathToS("ScreenOptions prev") ); m_SoundPrevRow.Load( THEME->GetPathToS("ScreenOptions prev") );
stepmania/src/ScreenOptions.h
+2 -1
View File
@@ -30,6 +30,8 @@ struct OptionRow
bool bOneChoiceForAllPlayers; bool bOneChoiceForAllPlayers;
vector<CString> choices; vector<CString> 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 ) 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; name = n;
@@ -96,7 +98,6 @@ protected:
int m_iSelectedOption[NUM_PLAYERS][MAX_OPTION_LINES]; int m_iSelectedOption[NUM_PLAYERS][MAX_OPTION_LINES];
private: private:
CString m_sName;
InputMode m_InputMode; InputMode m_InputMode;
bool m_bLoadExplanations; bool m_bLoadExplanations;